[Documentation] Update changelog for 0.8.1

Don't change the windowState when GUIChat is closed.

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: davidcernat
+custom: https://www.paypal.me/DavidCernat

.gitignore

@@ -5,7 +5,7 @@ CMakeCache.txt
 cmake_install.cmake
 Makefile
 makefile
-build*
+build*/
 prebuilt
 
 ##windows build process
@@ -31,6 +31,8 @@ files/windows/*.aps
 cmake-build-*
 ## qt-creator
 CMakeLists.txt.user*
+.vs
+.vscode
 
 ## resources
 data
@@ -82,5 +84,4 @@ moc_*.cxx
 *ui_playpage.h
 *.[ao]
 *.so
-openmw.appdata.xml
 venv/

.gitlab-ci.yml

@@ -1,69 +1,414 @@
+# Note: We set `needs` on each job to control the job DAG.
+# See https://docs.gitlab.com/ee/ci/yaml/#needs
 stages:
   - build
-  
-Debian:
+
+.Debian_Image:
   tags:
     - docker
     - linux
-  image: gcc
+  image: debian:bullseye
+
+.Debian:
+  extends: .Debian_Image
   cache:
-    key: apt-cache
     paths:
     - apt-cache/
-  before_script:
-    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-    - apt-get update -yq 
-    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev libsdl2-dev libqt4-dev libopenal-dev libopenscenegraph-3.4-dev libunshield-dev libtinyxml-dev
-  # - apt-get install -y libmygui-dev libbullet-dev  # to be updated to latest below because stretch is too old
-    - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet-dev_2.87+dfsg-2_amd64.deb -o libbullet-dev_2.87+dfsg-2_amd64.deb
-    - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet2.87_2.87+dfsg-2_amd64.deb -o libbullet2.87_2.87+dfsg-2_amd64.deb
-    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb -o libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb
-    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb -o libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb
-    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui-dev_3.2.2+dfsg-1_amd64.deb -o libmygui-dev_3.2.2+dfsg-1_amd64.deb
-    - dpkg --ignore-depends=libmygui.ogreplatform0debian1v5 -i *.deb 
+    - ccache/
   stage: build
-  script: 
-    - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
-    - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
-    - make -j$cores_to_use
-    - DESTDIR=artifacts make install
+  script:
+    - export CCACHE_BASEDIR="`pwd`"
+    - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
+    - ccache -z -M "${CCACHE_SIZE}"
+    - CI/before_script.linux.sh
+    - cd build
+    - cmake --build . -- -j $(nproc)
+    - cmake --install .
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_test_suite; fi
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi
+    - ccache -s
   artifacts:
     paths:
-      - build/artifacts/
-MacOS:
+      - build/install/
+
+Coverity:
+  extends: .Debian_Image
+  stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic coverity
+    - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN
+    - tar xfz /tmp/cov-analysis-linux64.tgz
+  script:
+    - CI/before_script.linux.sh
+    # Add more than just `openmw` once we can build everything under 3h
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw
+  after_script:
+    - tar cfz cov-int.tar.gz cov-int
+    - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
+      --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
+      --form file=@cov-int.tar.gz --form version="`git describe --tags`"
+      --form description="`git describe --tags` / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
+  variables:
+    CC: gcc
+    CXX: g++
+  timeout: 8h
+
+Debian_GCC:
+  extends: .Debian
+  cache:
+    key: Debian_GCC.v2
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
+  variables:
+    CC: gcc
+    CXX: g++
+    CCACHE_SIZE: 3G
+  # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
+  timeout: 2h
+
+Debian_GCC_tests:
+  extends: Debian_GCC
+  cache:
+    key: Debian_GCC_tests.v2
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+
+Debian_GCC_Static_Deps:
+  extends: Debian_GCC
+  cache:
+    key: Debian_GCC_Static_Deps
+    paths:
+    - apt-cache/
+    - ccache/
+    - build/extern/fetched/
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
+  variables:
+    CI_OPENMW_USE_STATIC_DEPS: 1
+
+Debian_GCC_Static_Deps_tests:
+  extends: Debian_GCC_Static_Deps
+  cache:
+    key: Debian_GCC_Static_Deps_tests
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+
+Debian_Clang:
+  extends: .Debian
+  before_script:
+    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
+  cache:
+    key: Debian_Clang.v2
+  variables:
+    CC: clang
+    CXX: clang++
+    CCACHE_SIZE: 2G
+  # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
+  timeout: 2h
+
+Debian_Clang_tests:
+  extends: Debian_Clang
+  cache:
+    key: Debian_Clang_tests.v2
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+
+.MacOS:
+  image: macos-11-xcode-12
   tags:
-    - macos
-    - xcode
-  except:
-    - branches # because our CI VMs are not public, MRs can't use them and timeout
+    - shared-macos-amd64
   stage: build
-  allow_failure: true
+  only:
+    variables:
+      - $CI_PROJECT_ID == "7107382"
+  cache:
+    paths:
+    - ccache/
   script:
-    - rm -fr build/*  #  remove anything in the build directory
+    - rm -fr build  # remove the build directory
     - CI/before_install.osx.sh
+    - export CCACHE_BASEDIR="$(pwd)"
+    - export CCACHE_DIR="$(pwd)/ccache"
+    - mkdir -pv "${CCACHE_DIR}"
+    - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.osx.sh
-    - cd build; make -j2 package
+    - cd build; make -j $(sysctl -n hw.logicalcpu) package
+    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.dmg"; done
+    - ccache -s
   artifacts:
     paths:
       - build/OpenMW-*.dmg
+      - "build/**/*.log"
+
+macOS11_Xcode12:
+  extends: .MacOS
+  image: macos-11-xcode-12
+  allow_failure: true
+  cache:
+    key: macOS11_Xcode12.v1
+  variables:
+    CCACHE_SIZE: 3G
+
+macOS10.15_Xcode11:
+  extends: .MacOS
+  image: macos-10.15-xcode-11
+  cache:
+    key: macOS10.15_Xcode11.v1
+  variables:
+    CCACHE_SIZE: 3G
+
+variables: &engine-targets
+  targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
+  package: "Engine"
+
+variables: &cs-targets
+  targets: "openmw-cs,bsatool,esmtool,niftest"
+  package: "CS"
+
+variables: &tests-targets
+  targets: "openmw_test_suite,openmw_detournavigator_navmeshtilescache_benchmark"
+  package: "Tests"
+
+.Windows_Ninja_Base:
+  tags:
+    - windows
+  before_script:
+  - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+  - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
+  - choco install git --force --params "/GitAndUnixToolsOnPath" -y
+  - choco install 7zip -y
+  - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
+  - choco install vswhere -y
+  - choco install ninja -y
+  - choco install python -y
+  - refreshenv
+  stage: build
+  script:
+    - $time = (Get-Date -Format "HH:mm:ss")
+    - echo ${time}
+    - echo "started by ${GITLAB_USER_NAME}"
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t
+    - cd MSVC2019_64_Ninja
+    - .\ActivateMSVC.ps1
+    - cmake --build . --config $config --target ($targets.Split(','))
+    - cd $config
+    - echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
+    - |
+      if (Get-ChildItem -Recurse *.pdb) {
+        7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' CI-ID.txt
+        Get-ChildItem -Recurse *.pdb | Remove-Item
+      }
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip '*'
+    - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
+  after_script:
+    - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
+  cache:
+    key: ninja-v2
+    paths:
+    - deps
+    - MSVC2019_64_Ninja/deps/Qt
+  artifacts:
+    when: always
+    paths:
+    - "*.zip"
+    - "*.log"
+    - MSVC2019_64_Ninja/*.log
+    - MSVC2019_64_Ninja/*/*.log
+    - MSVC2019_64_Ninja/*/*/*.log
+    - MSVC2019_64_Ninja/*/*/*/*.log
+    - MSVC2019_64_Ninja/*/*/*/*/*.log
+    - MSVC2019_64_Ninja/*/*/*/*/*/*.log
+    - MSVC2019_64_Ninja/*/*/*/*/*/*/*.log
+    - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
 
-Windows:
+Windows_Ninja_Engine_Release:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *engine-targets
+    config: "Release"
+
+Windows_Ninja_Engine_Debug:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *engine-targets
+    config: "Debug"
+
+Windows_Ninja_Engine_RelWithDebInfo:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *engine-targets
+    config: "RelWithDebInfo"
+
+Windows_Ninja_CS_Release:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *cs-targets
+    config: "Release"
+
+Windows_Ninja_CS_Debug:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *cs-targets
+    config: "Debug"
+
+Windows_Ninja_CS_RelWithDebInfo:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *cs-targets
+    config: "RelWithDebInfo"
+
+Windows_Ninja_Tests_RelWithDebInfo:
+  extends: .Windows_Ninja_Base
+  stage: build
+  variables:
+    <<: *tests-targets
+    config: "RelWithDebInfo"
+    # Gitlab can't successfully execute following binaries due to unknown reason
+    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+
+.Windows_MSBuild_Base:
   tags:
-    - win10
-    - msvc2017
-  except:
-    - branches # because our CI VMs are not public, MRs can't use them and timeout
+    - windows
+  before_script:
+  - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+  - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
+  - choco install git --force --params "/GitAndUnixToolsOnPath" -y
+  - choco install 7zip -y
+  - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
+  - choco install vswhere -y
+  - choco install python -y
+  - refreshenv
   stage: build
-  allow_failure: true
   script:
-    # - env  # turn on for debugging
-    - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
-    - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
-    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%
-    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\
+    - $time = (Get-Date -Format "HH:mm:ss")
+    - echo ${time}
+    - echo "started by ${GITLAB_USER_NAME}"
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t
+    - cd MSVC2019_64
+    - cmake --build . --config $config --target ($targets.Split(','))
+    - cd $config
+    - echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
+    - |
+      if (Get-ChildItem -Recurse *.pdb) {
+        7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' CI-ID.txt
+        Get-ChildItem -Recurse *.pdb | Remove-Item
+      }
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip '*'
+    - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
+  after_script:
+    - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
+    key: msbuild-v2
     paths:
     - deps
+    - MSVC2019_64/deps/Qt
   artifacts:
+    when: always
     paths:
     - "*.zip"
+    - "*.log"
+    - MSVC2019_64/*.log
+    - MSVC2019_64/*/*.log
+    - MSVC2019_64/*/*/*.log
+    - MSVC2019_64/*/*/*/*.log
+    - MSVC2019_64/*/*/*/*/*.log
+    - MSVC2019_64/*/*/*/*/*/*.log
+    - MSVC2019_64/*/*/*/*/*/*/*.log
+    - MSVC2019_64/*/*/*/*/*/*/*/*.log
+
+Windows_MSBuild_Engine_Release:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *engine-targets
+    config: "Release"
+
+Windows_MSBuild_Engine_Debug:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *engine-targets
+    config: "Debug"
+
+Windows_MSBuild_Engine_RelWithDebInfo:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *engine-targets
+    config: "RelWithDebInfo"
+
+Windows_MSBuild_CS_Release:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *cs-targets
+    config: "Release"
+
+Windows_MSBuild_CS_Debug:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *cs-targets
+    config: "Debug"
+
+Windows_MSBuild_CS_RelWithDebInfo:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *cs-targets
+    config: "RelWithDebInfo"
+
+Windows_MSBuild_Tests_RelWithDebInfo:
+  extends: .Windows_MSBuild_Base
+  stage: build
+  variables:
+    <<: *tests-targets
+    config: "RelWithDebInfo"
+    # Gitlab can't successfully execute following binaries due to unknown reason
+    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+
+Debian_AndroidNDK_arm64-v8a:
+  tags:
+    - linux
+  image: debian:bullseye
+  variables:
+    CCACHE_SIZE: 3G
+  cache:
+    key: Debian_AndroidNDK_arm64-v8a.v3
+    paths:
+      - apt-cache/
+      - ccache/
+      - build/extern/fetched/
+  before_script:
+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+    - echo "deb http://deb.debian.org/debian unstable main contrib" > /etc/apt/sources.list
+    - echo "google-android-ndk-installer google-android-installers/mirror select https://dl.google.com" | debconf-set-selections
+    - apt-get update -yq
+    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential google-android-ndk-installer
+  stage: build
+  script:
+    - export CCACHE_BASEDIR="`pwd`"
+    - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
+    - ccache -z -M "${CCACHE_SIZE}"
+    - CI/before_install.android.sh
+    - CI/before_script.android.sh
+    - cd build
+    - cmake --build . -- -j $(nproc)
+    - cmake --install .
+    - ccache -s
+  artifacts:
+    paths:
+      - build/install/
+  # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
+  timeout: 1h30m

.readthedocs.yaml

@@ -0,0 +1,10 @@
+version: 2
+
+sphinx:
+  configuration: docs/source/conf.py
+
+python:
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt
+

.travis.yml

@@ -1,10 +1,4 @@
-os:
- - linux
-# - osx
-osx_image: xcode9.4
 language: cpp
-sudo: required
-dist: xenial
 branches:
   only:
     - master
@@ -15,69 +9,83 @@ env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
-  - secure: 1QK0yVyoOB+gf2I7XzvhXu9w/5lq4stBXIwJbVCTjz4Q4XVHCosURaW1MAgKzMrPnbFEwjyn5uQ8BwsvvfkuN1AZD0YXITgc7gyI+J1wQ/p/ljxRxglakU6WEgsTs2J5z9UmGac4YTXg+quK7YP3rv+zuGim2I2rhzImejyzp0Ym3kRCnNcy+SGBsiRaevRJMe00Ch8zGAbEhduQGeSoS6W0rcu02DNlQKiq5NktWsXR+TWWWVfIeIlQR/lbPsCd0pdxMaMv2QCY0rVbwrYxWJwr/Qe45dAdWp+8/C3PbXpeMSGxlLa33nJNX4Lf/djxbjm8KWk6edaXPajrjR/0iwcpwq0jg2Jt6XfEdnJt35F1gpXlc04sxStjG45uloOKCFYT0wdhIO1Lq+hDP54wypQl+JInd5qC001O7pwhVxO36EgKWqo8HD+BqGDBwsNj2engy9Qcp3wO6G0rLBPB3CrZsk9wrHVv5cSiQSLMhId3Xviu3ZI2qEDA+kgTvxrKrsnMj4bILVCyG5Ka2Mj22wIDW9e8oIab9oTdujax3DTN1GkD6QuOAGzwDsNwGASsgfoeZ+FUhgM75RlBWGMilgkmnF7EJ0oAXLEpjtABnEr2d4qHv+y08kOuTDBLB9ExzCIj024dYYYNLZrqPKx0ncHuCMG2QNj2aJAJEZtj1rQ=
-
+   - secure: "1QK0yVyoOB+gf2I7XzvhXu9w/5lq4stBXIwJbVCTjz4Q4XVHCosURaW1MAgKzMrPnbFEwjyn5uQ8BwsvvfkuN1AZD0YXITgc7gyI+J1wQ/p/ljxRxglakU6WEgsTs2J5z9UmGac4YTXg+quK7YP3rv+zuGim2I2rhzImejyzp0Ym3kRCnNcy+SGBsiRaevRJMe00Ch8zGAbEhduQGeSoS6W0rcu02DNlQKiq5NktWsXR+TWWWVfIeIlQR/lbPsCd0pdxMaMv2QCY0rVbwrYxWJwr/Qe45dAdWp+8/C3PbXpeMSGxlLa33nJNX4Lf/djxbjm8KWk6edaXPajrjR/0iwcpwq0jg2Jt6XfEdnJt35F1gpXlc04sxStjG45uloOKCFYT0wdhIO1Lq+hDP54wypQl+JInd5qC001O7pwhVxO36EgKWqo8HD+BqGDBwsNj2engy9Qcp3wO6G0rLBPB3CrZsk9wrHVv5cSiQSLMhId3Xviu3ZI2qEDA+kgTvxrKrsnMj4bILVCyG5Ka2Mj22wIDW9e8oIab9oTdujax3DTN1GkD6QuOAGzwDsNwGASsgfoeZ+FUhgM75RlBWGMilgkmnF7EJ0oAXLEpjtABnEr2d4qHv+y08kOuTDBLB9ExzCIj024dYYYNLZrqPKx0ncHuCMG2QNj2aJAJEZtj1rQ="
+cache: ccache
 addons:
   apt:
     sources:
       - sourceline: 'ppa:openmw/openmw'
-      - sourceline: 'ppa:rakhimov/boost'
       - ubuntu-toolchain-r-test
     packages: [
       # Dev
-      cmake, clang-6.0, libunshield-dev, libtinyxml-dev,
-      g++-8,
-      # Tests
-      libgtest-dev, google-mock,
+      cmake, clang-tools-7, gcc-8, g++-8, ccache,
       # Boost
-      libboost-filesystem1.61-dev, libboost-program-options1.61-dev, libboost-system1.61-dev,
+      libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev,
       # FFmpeg
-      libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev,
-      # Audio & Video
-      libsdl2-dev, qtbase5-dev, libopenal-dev,
+      libavcodec-dev, libavformat-dev, libavutil-dev, libswresample-dev, libswscale-dev,
+      # Audio, Video and Misc. deps
+      libsdl2-dev, libqt5opengl5-dev, libopenal-dev, libunshield-dev, libtinyxml-dev, liblz4-dev,
       # The other ones from OpenMW ppa
-      libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev,
+      libbullet-dev, libopenscenegraph-3.4-dev, libmygui-dev,
       # tes3mp stuff
-      libboost1.61-dev, libqt5opengl5-dev, libluajit-5.1-dev
+      libboost-dev, libqt5opengl5-dev, libluajit-5.1-dev
     ]
-
   coverity_scan:
     project:
       name: "TES3MP/openmw-tes3mp"
       description: "<Your project description here>"
-    notification_email: koncord@tes3mp.com
-    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_LAUNCHER=FALSE"
-    build_command:   "make -j3"
     branch_pattern: coverity_scan
+    notification_email: koncord@tes3mp.com
+    build_command_prepend: "cov-configure --comptype gcc --compiler gcc-8 --template; cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_LAUNCHER=FALSE"
+    build_command: "make VERBOSE=1 -j3"
 matrix:
   include:
     - os: linux
       env:
-        - ANALYZE="scan-build-6.0 --use-cc clang-6.0 --use-c++ clang++-6.0 "
-        - MATRIX_CC="CC=clang-6.0 && CXX=clang++-6.0"
+        - ANALYZE="scan-build-7 --use-cc clang-7 --use-c++ clang++-7 "
+        - MATRIX_CC="CC=clang-7 && CXX=clang++-7"
       compiler: clang
+      sudo: required
+      dist: bionic
     - os: linux
       env:
         - MATRIX_CC="CC=gcc-8 && CXX=g++-8"
+      sudo: required
+      dist: bionic
     - os: linux
       env:
-        - MATRIX_CC="CC=clang-6.0 && CXX=clang++-6.0"
+        - MATRIX_CC="CC=clang-7 && CXX=clang++-7"
+      sudo: required
+      dist: bionic
   allow_failures:
     - env:
-        - MATRIX_CC="CC=clang-6.0 && CXX=clang++-6.0"
+        - MATRIX_CC="CC=clang-7 && CXX=clang++-7"
     - env:
-        - ANALYZE="scan-build-6.0 --use-cc clang-6.0 --use-c++ clang++-6.0 "
-        - MATRIX_CC="CC=clang-6.0 && CXX=clang++-6.0"
+        - ANALYZE="scan-build-7 --use-cc clang-7 --use-c++ clang++-7 "
+        - MATRIX_CC="CC=clang-7 && CXX=clang++-7"
 
 before_install:
-      - ./CI/before_install.${TRAVIS_OS_NAME}.sh
-before_script: ./CI/before_script.${TRAVIS_OS_NAME}.sh
+    - ./CI/before_install.${TRAVIS_OS_NAME}.sh
+before_script:
+    - ccache -z
+    - ./CI/before_script.${TRAVIS_OS_NAME}.sh
 script:
  - cd ./build
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j3; fi
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
+ - ${ANALYZE} make -j3; fi
+ - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
+ - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
+ - if [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${BUILD_TESTS_ONLY}" ]; then ./openmw_test_suite; fi
+ - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
+ - cd "${TRAVIS_BUILD_DIR}"
+ - ccache -s
+#deploy:
+# provider: script
+# script: ./CI/deploy.osx.sh
+# skip_cleanup: true
+# on:
+#  branch: master
+#  condition: "$TRAVIS_EVENT_TYPE = cron && $TRAVIS_OS_NAME = osx"
+#  repo: TES3MP/openmw-tes3mp
 #notifications:
 #  email:
 #    recipients:

AUTHORS.md

@@ -4,13 +4,16 @@ Contributors
 The OpenMW project was started in 2008 by Nicolay Korslund.
 In the course of years many people have contributed to the project.
 
-If you feel your name is missing from this list, please notify a developer.
+If you feel your name is missing from this list, please add it to `AUTHORS.md`.
 
 
 Programmers
 -----------
 
-    Marc Zinnschlag (Zini) - Lead Programmer/Project Manager
+    Bret Curtis (psi29a) - Project leader 2019-present
+    Marc Zinnschlag (Zini) - Project leader 2010-2018
+    Nicolay Korslund - Project leader 2008-2010
+    scrawl - Top contributor
 
     Adam Hogan (aurix)
     Aesylwinn
@@ -21,32 +24,40 @@ Programmers
     Alex McKibben
     alexanderkjall
     Alexander Nadeau (wareya)
-    Alexander Olofsson (Ace)
+    Alexander Olofsson (Ananace)
+    Alex Rice
     Alex S (docwest)
     Allofich
     Andrei Kortunov (akortunov)
     AnyOldName3
-    Aussiemon
-    Austin Salgat (Salgat)
+    Ardekantur
+    Armin Preiml
     Artem Kotsynyak (greye)
+    Artem Nykolenko (anikm21)
     artemutin
     Arthur Moore (EmperorArthur)
     Assumeru
     athile
+    Aussiemon
+    Austin Salgat (Salgat)
     Ben Shealy (bentsherman)
-    Bret Curtis (psi29a)
+    Berulacks
     Britt Mathis (galdor557)
     Capostrophic
+    Carl Maxwell
     cc9cii
     Cédric Mocquillon
     Chris Boyce (slothlife)
     Chris Robinson (KittyCat)
+    Cody Glassman (Wazabear)
+    Coleman Smith (olcoal)
     Cory F. Cohen (cfcohen)
     Cris Mihalache (Mirceam)
     crussell187
     DanielVukelich
     darkf
     David Cernat (davidcernat)
+    Declan Millar (declan-millar)
     devnexen
     Dieho
     Dmitry Shkurskiy (endorph)
@@ -54,10 +65,11 @@ Programmers
     Douglas Mencken (dougmencken)
     dreamer-dead
     David Teviotdale (dteviot)
+    Diggory Hardy
+    Dmitry Marakasov (AMDmi3)
     Edmondo Tommasina (edmondo)
     Eduard Cot (trombonecot)
     Eli2
-    elsid
     Emanuel Guével (potatoesmaster)
     eroen
     escondida
@@ -66,16 +78,28 @@ Programmers
     Fil Krynicki (filkry)
     Finbar Crago (finbar-crago)
     Florian Weber (Florianjw)
+    Frédéric Chardon (fr3dz10)
+    Gaëtan Dezeiraud (Brouilles)
     Gašper Sedej
+    Gijsbert ter Horst (Ghostbird)
+    Gohan1989
     gugus/gus
-    Hallfaer Tuilinn
+    guidoj
     Haoda Wang (h313)
     hristoast
     Internecine
-    Jacob Essex (Yacoby)    
+    Jackerty
+    Jacob Essex (Yacoby)
+    Jacob Turnbull (Tankinfrank)
     Jake Westrip (16bitint)
+    James Carty (MrTopCat)
+    James Moore (moore.work)
+    James Stephens (james-h-stephens)
+    Jan-Peter Nilsson (peppe)
+    Jan Borsodi (am0s)
     Jason Hooks (jhooks)
     jeaye
+    jefetienne
     Jeffrey Haines (Jyby)
     Jengerer
     Jiří Kuneš (kunesj)
@@ -84,6 +108,7 @@ Programmers
     John Blomberg (fstp)
     Jordan Ayers
     Jordan Milne
+    Josua Grawitter
     Jules Blok (Armada651)
     julianko
     Julien Voisin (jvoisin/ap0)
@@ -95,11 +120,11 @@ Programmers
     lazydev
     Leon Krieg (lkrieg)
     Leon Saunders (emoose)
-    Łukasz Gołębiewski (lukago)
     logzero
     lohikaarme
+    Lordrea
+    Łukasz Gołębiewski (lukago)
     Lukasz Gromanowski (lgro)
-    Manuel Edelmann (vorenon)
     Marc Bouvier (CramitDeFrog)
     Marcin Hulist (Gohan)
     Mark Siewert (mark76)
@@ -108,10 +133,13 @@ Programmers
     Martin Otto (MAtahualpa)
     Mateusz Kołaczek (PL_kolek)
     Mateusz Malisz (malice)
+    Max Henzerling (SaintMercury)
     megaton
     Michael Hogan (Xethik)
     Michael Mc Donnell
     Michael Papageorgiou (werdanith)
+    Michael Stopa (Stomy)
+    Michał Ściubidło (mike-sc)
     Michał Bień (Glorf)
     Michał Moroz (dragonee)
     Miloslav Číž (drummyfish)
@@ -120,18 +148,25 @@ Programmers
     Mitchell Schwitzer (schwitzerm)
     naclander
     Narmo
+    Nat Meo (Utopium)
     Nathan Jeffords (blunted2night)
     NeveHanter
     Nialsy
+    Nick Crawford (nighthawk469)
     Nikolay Kasyanov (corristo)
     nobrakal
     Nolan Poe (nopoe)
     Oleg Chkan (mrcheko)
     Paul Cercueil (pcercuei)
     Paul McElroy (Greendogo)
+    pchan3
+    Perry Hugh
+    Petr Mikheev (ptmikheev)
+    Phillip Andrews (PhillipAnd)
     Pi03k
     Pieter van der Kloet (pvdk)
     pkubik
+    PLkolek
     PlutonicOverkill
     Radu-Marius Popovici (rpopovici)
     Rafael Moura (dhustkoder)
@@ -145,33 +180,49 @@ Programmers
     Roman Proskuryakov (kpp)
     Roman Siromakha (elsid)
     Sandy Carter (bwrsandman)
-    Scott Howard
-    scrawl
+    Scott Howard (maqifrnswa)
     Sebastian Wick (swick)
-    Sergey Shambir
+    Sergey Fukanchik
+    Sergey Shambir (sergey-shambir)
+    sergoz
     ShadowRadiance
     Siimacore
+    Simon Meulenbeek (simonmb)
     sir_herrbatka
     smbas
+    Sophie Kirschner (pineapplemachine)
     spycrab
     Stefan Galowicz (bogglez)
     Stanislav Bobrov (Jiub)
+    Stanislaw Halik (sthalik)
+    Star-Demon
     stil-t
     svaante
     Sylvain Thesnieres (Garvek)
     t6
     terrorfisch
+    Tess (tescoShoppah)
     thegriglat
     Thomas Luppi (Digmaster)
+    tlmullis
     tri4ng1e
-    unelsson
-    Will Herrmann (Thunderforge)
+    Thoronador
     Tom Mason (wheybags)
     Torben Leif Carrington (TorbenC)
+    unelsson
+    uramer
     viadanna
     Vincent Heuken
+    Vladimir Panteleev (CyberShadow)
+    Wang Ryu (bzzt)
+    Will Herrmann (Thunderforge)
     vocollapse
+    xyzz
+    Yohaulticetl
+    Yuri Krupenin
     zelurker
+    Noah Gooder
+    Andrew Appuhamy (andrew-app)
 
 Documentation
 -------------
@@ -181,13 +232,17 @@ Documentation
     Bodillium
     Bret Curtis (psi29a)
     Cramal
+    David Walley (Loriel)
+    Diego Crespo
+    Joakim Berg (lysol90)
     Ryan Tucker (Ravenwing)
     sir_herrbatka
 
 Packagers
 ---------
 
-    Alexander Olofsson (Ace) - Windows
+    Alexander Olofsson (Ananace) - Windows and Flatpak
+    Alexey Sokolov (DarthGandalf) - Gentoo Linux
     Bret Curtis (psi29a) - Debian and Ubuntu Linux
     Edmondo Tommasina (edmondo) - Gentoo Linux
     Julian Ospald (hasufell) - Gentoo Linux
@@ -201,13 +256,19 @@ Public Relations and Translations
 
     Artem Kotsynyak (greye) - Russian News Writer
     Dawid Lakomy (Vedyimyn) - Polish News Writer
+    ElderTroll - Release Manager
     Jim Clauwaert (Zedd) - Public Outreach
+    juanmnzsk8 - Spanish News Writer
     Julien Voisin (jvoisin/ap0) - French News Writer
+    Kingpix - Italian News Writer
     Lukasz Gromanowski (lgro) - English News Writer
     Martin Otto (Atahualpa) - Podcaster, Public Outreach, German Translator
     Mickey Lyle (raevol) - Release Manager
+    Nekochan - English News Writer
+    penguinroad - Indonesian News Writer
     Pithorn - Chinese News Writer
     sir_herrbatka - Polish News Writer
+    spyboot - German Translator
     Tom Koenderink (Okulo) - English News Writer
 
 Website
@@ -237,34 +298,6 @@ Artwork
     Mickey Lyle (raevol) - Wordpress Theme
     Tom Koenderink (Okulo), SirHerrbatka, crysthala, Shnatsel, Lamoot - OpenMW Editor Icons
 
-Inactive Contributors
----------------------
-
-    Ardekantur
-    Armin Preiml
-    Berulacks
-    Carl Maxwell
-    Diggory Hardy
-    Dmitry Marakasov (AMDmi3)
-    ElderTroll
-    guidoj
-    Jan-Peter Nilsson (peppe)
-    Jan Borsodi
-    Josua Grawitter
-    juanmnzsk8
-    Kingpix
-    Lordrea
-    Michal Sciubidlo
-    Nicolay Korslund
-    Nekochan
-    pchan3
-    penguinroad
-    sergoz
-    spyboot
-    Star-Demon
-    Thoronador
-    Yuri Krupenin
-
 Additional Credits
 ------------------
 In this section we would like to thank people not part of OpenMW for their work.
@@ -279,4 +312,4 @@ Thanks to Kevin Ryan,
 for creating the icon used for the Data Files tab of the OpenMW Launcher.
 
 Thanks to DejaVu team,
-for their DejaVuLGCSansMono fontface, see DejaVu Font License.txt for their license terms.
+for their DejaVuLGCSansMono fontface, see DejaVuFontLicense.txt for their license terms.

CHANGELOG.md

@@ -1,10 +1,482 @@
+0.47.0
+------
+
+    Bug #1662: Qt4 and Windows binaries crash if there's a non-ASCII character in a file path/config path
+    Bug #1901: Actors colliding behaviour is different from vanilla
+    Bug #1952: Incorrect particle lighting
+    Bug #2069: Fireflies in Fireflies invade Morrowind look wrong
+    Bug #2311: Targeted scripts are not properly supported on non-unique RefIDs
+    Bug #2473: Unable to overstock merchants
+    Bug #2976: [reopened]: Issues combining settings from the command line and both config files
+    Bug #3137: Walking into a wall prevents jumping
+    Bug #3372: Projectiles and magic bolts go through moving targets
+    Bug #3676: NiParticleColorModifier isn't applied properly
+    Bug #3714: Savegame fails to load due to conflict between SpellState and MagicEffects
+    Bug #3789: Crash in visitEffectSources while in battle
+    Bug #3862: Random container contents behave differently than vanilla
+    Bug #3929: Leveled list merchant containers respawn on barter
+    Bug #4021: Attributes and skills are not stored as floats
+    Bug #4039: Multiple followers should have the same following distance
+    Bug #4055: Local scripts don't inherit variables from their base record
+    Bug #4083: Door animation freezes when colliding with actors
+    Bug #4247: Cannot walk up stairs in Ebonheart docks
+    Bug #4357: OpenMW-CS: TopicInfos index sorting and rearranging isn't fully functional
+    Bug #4363: OpenMW-CS: Defect in Clone Function for Dialogue Info records
+    Bug #4447: Actor collision capsule shape allows looking through some walls
+    Bug #4465: Collision shape overlapping causes twitching
+    Bug #4476: Abot Gondoliers: player hangs in air during scenic travel
+    Bug #4568: Too many actors in one spot can push other actors out of bounds
+    Bug #4623: Corprus implementation is incorrect
+    Bug #4631: Setting MSAA level too high doesn't fall back to highest supported level
+    Bug #4764: Data race in osg ParticleSystem
+    Bug #4765: Data race in ChunkManager -> Array::setBinding
+    Bug #4774: Guards are ignorant of an invisible player that tries to attack them
+    Bug #5026: Data races with rain intensity uniform set by sky and used by water
+    Bug #5101: Hostile followers travel with the player
+    Bug #5108: Savegame bloating due to inefficient fog textures format
+    Bug #5165: Active spells should use real time intead of timestamps
+    Bug #5300: NPCs don't switch from torch to shield when starting combat
+    Bug #5358: ForceGreeting always resets the dialogue window completely
+    Bug #5363: Enchantment autocalc not always 0/1
+    Bug #5364: Script fails/stops if trying to startscript an unknown script
+    Bug #5367: Selecting a spell on an enchanted item per hotkey always plays the equip sound
+    Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
+    Bug #5370: Opening an unlocked but trapped door uses the key
+    Bug #5384: OpenMW-CS: Deleting an instance requires reload of scene window to show in editor
+    Bug #5387: Move/MoveWorld don't update the object's cell properly
+    Bug #5391: Races Redone 1.2 bodies don't show on the inventory
+    Bug #5397: NPC greeting does not reset if you leave + reenter area
+    Bug #5400: OpenMW-CS: Verifier checks race of non-skin bodyparts
+    Bug #5403: Enchantment effect doesn't show on an enemy during death animation
+    Bug #5415: Environment maps in ebony cuirass and HiRez Armors Indoril cuirass don't work
+    Bug #5416: Junk non-node records before the root node are not handled gracefully
+    Bug #5422: The player loses all spells when resurrected
+    Bug #5423: Guar follows actors too closely
+    Bug #5424: Creatures do not headtrack player
+    Bug #5425: Poison effect only appears for one frame
+    Bug #5427: GetDistance unknown ID error is misleading
+    Bug #5431: Physics performance degradation after a specific number of actors on a scene
+    Bug #5435: Enemies can't hurt the player when collision is off
+    Bug #5441: Enemies can't push a player character when in critical strike stance
+    Bug #5451: Magic projectiles don't disappear with the caster
+    Bug #5452: Autowalk is being included in savegames
+    Bug #5469: Local map is reset when re-entering certain cells
+    Bug #5472: Mistify mod causes CTD in 0.46 on Mac
+    Bug #5473: OpenMW-CS: Cell border lines don't update properly on terrain change
+    Bug #5479: NPCs who should be walking around town are standing around without walking
+    Bug #5484: Zero value items shouldn't be able to be bought or sold for 1 gold
+    Bug #5485: Intimidate doesn't increase disposition on marginal wins
+    Bug #5490: Hits to carried left slot aren't redistributed if there's no shield equipped
+    Bug #5499: Faction advance is available when requirements not met
+    Bug #5502: Dead zone for analogue stick movement is too small
+    Bug #5507: Sound volume is not clamped on ingame settings update
+    Bug #5525: Case-insensitive search in the inventory window does not work with non-ASCII characters
+    Bug #5531: Actors flee using current rotation by axis x
+    Bug #5539: Window resize breaks when going from a lower resolution to full screen resolution
+    Bug #5548: Certain exhausted topics can be highlighted again even though there's no new dialogue
+    Bug #5557: Diagonal movement is noticeably slower with analogue stick
+    Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics
+    Bug #5603: Setting constant effect cast style doesn't correct effects view
+    Bug #5604: Only one valid NIF root node is loaded from a single file
+    Bug #5611: Usable items with "0 Uses" should be used only once
+    Bug #5619: Input events are queued during save loading
+    Bug #5622: Can't properly interact with the console when in pause menu
+    Bug #5627: Bookart not shown if it isn't followed by <BR> statement
+    Bug #5633: Damage Spells in effect before god mode is enabled continue to hurt the player character and can kill them
+    Bug #5639: Tooltips cover Messageboxes
+    Bug #5644: Summon effects running on the player during game initialization cause crashes
+    Bug #5656: Sneaking characters block hits while standing
+    Bug #5661: Region sounds don't play at the right interval
+    Bug #5675: OpenMW-CS: FRMR subrecords are saved with the wrong MastIdx
+    Bug #5680: Bull Netches incorrectly aim over the player character's head and always miss
+    Bug #5681: Player character can clip or pass through bridges instead of colliding against them
+    Bug #5687: Bound items covering the same inventory slot expiring at the same time freezes the game
+    Bug #5688: Water shader broken indoors with enable indoor shadows = false
+    Bug #5695: ExplodeSpell for actors doesn't target the ground
+    Bug #5703: OpenMW-CS menu system crashing on XFCE
+    Bug #5706: AI sequences stop looping after the saved game is reloaded
+    Bug #5713: OpenMW-CS: Collada models are corrupted in Qt-based scene view
+    Bug #5731: OpenMW-CS: skirts are invisible on characters
+    Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
+    Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
+    Bug #5762: Movement solver is insufficiently robust
+    Bug #5800: Equipping a CE enchanted ring deselects an already equipped and selected enchanted ring from the spell menu
+    Bug #5807: Video decoding crash on ARM
+    Bug #5821: NPCs from mods getting removed if mod order was changed
+    Bug #5835: OpenMW doesn't accept negative values for NPC's hello, alarm, fight, and flee
+    Bug #5836: OpenMW dialogue/greeting/voice filter doesn't accept negative Ai values for NPC's hello, alarm, fight, and flee
+    Bug #5838: Local map and other menus become blank in some locations while playing Wizards' Islands mod.
+    Bug #5840: GetSoundPlaying "Health Damage" doesn't play when NPC hits target with shield effect ( vanilla engine behavior )
+    Bug #5841: Can't Cast Zero Cost Spells When Magicka is < 0
+    Bug #5869: Guards can initiate arrest dialogue behind locked doors
+    Bug #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
+    Bug #5877: Effects appearing with empty icon
+    Bug #5899: Visible modal windows and dropdowns crashing game on exit
+    Bug #5902: NiZBufferProperty is unable to disable the depth test
+    Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs
+    Bug #5912: ImprovedBound mod doesn't work
+    Bug #5914: BM: The Swimmer can't reach destination
+    Bug #5923: Clicking on empty spaces between journal entries might show random topics
+    Bug #5934: AddItem command doesn't accept negative values
+    Bug #5975: NIF controllers from sheath meshes are used
+    Bug #5991: Activate should always be allowed for inventory items
+    Bug #5995: NiUVController doesn't calculate the UV offset properly
+    Bug #6007: Crash when ending cutscene is playing
+    Bug #6016: Greeting interrupts Fargoth's sneak-walk
+    Bug #6022: OpenMW-CS: Terrain selection is not updated when undoing/redoing terrain changes
+    Bug #6023: OpenMW-CS: Clicking on a reference in "Terrain land editing" mode discards corresponding select/edit action
+    Bug #6028: Particle system controller values are incorrectly used
+    Bug #6035: OpenMW-CS: Circle brush in "Terrain land editing" mode sometimes includes vertices outside its radius
+    Bug #6036: OpenMW-CS: Terrain selection at the border of cells omits certain corner vertices
+    Bug #6043: Actor can have torch missing when torch animation is played
+    Bug #6047: Mouse bindings can be triggered during save loading
+    Bug #6136: Game freezes when NPCs try to open doors that are about to be closed
+    Bug #6294: Game crashes with empty pathgrid
+    Feature #390: 3rd person look "over the shoulder"
+    Feature #832: OpenMW-CS: Handle deleted references
+    Feature #1536: Show more information about level on menu
+    Feature #2159: "Graying out" exhausted dialogue topics
+    Feature #2386: Distant Statics in the form of Object Paging
+    Feature #2404: Levelled List can not be placed into a container
+    Feature #2686: Timestamps in openmw.log
+    Feature #2798: Mutable ESM records
+    Feature #3171: OpenMW-CS: Instance drag selection
+    Feature #3983: Wizard: Add link to buy Morrowind
+    Feature #4201: Projectile-projectile collision
+    Feature #4486: Handle crashes on Windows
+    Feature #4894: Consider actors as obstacles for pathfinding
+    Feature #4899: Alpha-To-Coverage Anti-Aliasing for alpha testing
+    Feature #4917: Do not trigger NavMesh update when RecastMesh update should not change NavMesh
+    Feature #4977: Use the "default icon.tga" when an item's icon is not found
+    Feature #5043: Head Bobbing
+    Feature #5199: OpenMW-CS: Improve scene view colors
+    Feature #5297: Add a search function to the "Datafiles" tab of the OpenMW launcher
+    Feature #5362: Show the soul gems' trapped soul in count dialog
+    Feature #5445: Handle NiLines
+    Feature #5456: Basic collada animation support
+    Feature #5457: Realistic diagonal movement
+    Feature #5486: Fixes trainers to choose their training skills based on their base skill points
+    Feature #5500: Prepare enough navmesh tiles before scene loading ends
+    Feature #5511: Add in game option to toggle HRTF support in OpenMW
+    Feature #5519: Code Patch tab in launcher
+    Feature #5524: Resume failed script execution after reload
+    Feature #5545: Option to allow stealing from an unconscious NPC during combat
+    Feature #5551: Do not reboot PC after OpenMW installation on Windows
+    Feature #5563: Run physics update in background thread
+    Feature #5579: MCP SetAngle enhancement
+    Feature #5580: Service refusal filtering
+    Feature #5610: Actors movement should be smoother
+    Feature #5642: Ability to attach arrows to actor skeleton instead of bow mesh
+    Feature #5649: Skyrim SE compressed BSA format support
+    Feature #5672: Make stretch menu background configuration more accessible
+    Feature #5692: Improve spell/magic item search to factor in magic effect names
+    Feature #5730: Add graphic herbalism option to the launcher and documents
+    Feature #5771: ori command should report where a mesh is loaded from and whether the x version is used.
+    Feature #5813: Instanced groundcover support
+    Feature #5814: Bsatool should be able to create BSA archives, not only to extract it
+    Feature #5828: Support more than 8 lights
+    Feature #5910: Fall back to delta time when physics can't keep up
+    Feature #5980: Support Bullet with double precision instead of one with single precision
+    Feature #6024: OpenMW-CS: Selecting terrain in "Terrain land editing" should support "Add to selection" and "Remove from selection" modes
+    Feature #6033: Include pathgrid to navigation mesh
+    Feature #6034: Find path based on area cost depending on NPC stats
+    Task #5480: Drop Qt4 support
+    Task #5520: Improve cell name autocompleter implementation
+
+0.46.0
+------
+
+    Bug #1515: Opening console masks dialogue, inventory menu
+    Bug #1933: Actors can have few stocks of the same item
+    Bug #2395: Duplicated plugins in the launcher when multiple data directories provide the same plugin
+    Bug #2679: Unable to map mouse wheel under control settings
+    Bug #2969: Scripted items can stack
+    Bug #2976: [reopened in 0.47] Data lines in global openmw.cfg take priority over user openmw.cfg
+    Bug #2987: Editor: some chance and AI data fields can overflow
+    Bug #3006: 'else if' operator breaks script compilation
+    Bug #3109: SetPos/Position handles actors differently
+    Bug #3282: Unintended behaviour when assigning F3 and Windows keys
+    Bug #3550: Companion from mod attacks the air after combat has ended
+    Bug #3609: Items from evidence chest are not considered to be stolen if player is allowed to use the chest
+    Bug #3623: Display scaling breaks mouse recognition
+    Bug #3725: Using script function in a non-conditional expression breaks script compilation
+    Bug #3733: Normal maps are inverted on mirrored UVs
+    Bug #3765: DisableTeleporting makes Mark/Recall/Intervention effects undetectable
+    Bug #3778: [Mod] Improved Thrown Weapon Projectiles - weapons have wrong transformation during throw animation
+    Bug #3812: Wrong multiline tooltips width when word-wrapping is enabled
+    Bug #3894: Hostile spell effects not detected/present on first frame of OnPCHitMe
+    Bug #3977: Non-ASCII characters in object ID's are not supported
+    Bug #4009: Launcher does not show data files on the first run after installing
+    Bug #4077: Enchanted items are not recharged if they are not in the player's inventory
+    Bug #4141: PCSkipEquip isn't set to 1 when reading books/scrolls
+    Bug #4240: Ash storm origin coordinates and hand shielding animation behavior are incorrect
+    Bug #4262: Rain settings are hardcoded
+    Bug #4270: Closing doors while they are obstructed desyncs closing sfx
+    Bug #4276: Resizing character window differs from vanilla
+    Bug #4284: ForceSneak behaviour is inconsistent if the target has AiWander package
+    Bug #4329: Removed birthsign abilities are restored after reloading the save
+    Bug #4341: Error message about missing GDB is too vague
+    Bug #4383: Bow model obscures crosshair when arrow is drawn
+    Bug #4384: Resist Normal Weapons only checks ammunition for ranged weapons
+    Bug #4411: Reloading a saved game while falling prevents damage in some cases
+    Bug #4449: Value returned by GetWindSpeed is incorrect
+    Bug #4456: AiActivate should not be cancelled after target activation
+    Bug #4493: If the setup doesn't find what it is expecting, it fails silently and displays the requester again instead of letting the user know what wasn't found.
+    Bug #4523: "player->ModCurrentFatigue -0.001" in global script does not cause the running player to fall
+    Bug #4540: Rain delay when exiting water
+    Bug #4594: Actors without AI packages don't use Hello dialogue
+    Bug #4598: Script parser does not support non-ASCII characters
+    Bug #4600: Crash when no sound output is available or --no-sound is used.
+    Bug #4601: Filtering referenceables by gender is broken
+    Bug #4639: Black screen after completing first mages guild mission + training
+    Bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
+    Bug #4680: Heap corruption on faulty esp
+    Bug #4701: PrisonMarker record is not hardcoded like other markers
+    Bug #4703: Editor: it's possible to preview levelled list records
+    Bug #4705: Editor: unable to open exterior cell views from Instances table
+    Bug #4714: Crash upon game load in the repair menu while the "Your repair failed!" message is active
+    Bug #4715: "Cannot get class of an empty object" exception after pressing ESC in the dialogue mode
+    Bug #4720: Inventory avatar has shield with two-handed weapon during [un]equipping animation
+    Bug #4723: ResetActors command works incorrectly
+    Bug #4736: LandTexture records overrides do not work
+    Bug #4745: Editor: Interior cell lighting field values are not displayed as colors
+    Bug #4746: Non-solid player can't run or sneak
+    Bug #4747: Bones are not read from X.NIF file for NPC animation
+    Bug #4748: Editor: Cloned, moved, added instances re-use RefNum indices
+    Bug #4750: Sneaking doesn't work in first person view if the player is in attack ready state
+    Bug #4756: Animation issues with VAOs
+    Bug #4757: Content selector: files can be cleared when there aren't any files to clear
+    Bug #4768: Fallback numerical value recovery chokes on invalid arguments
+    Bug #4775: Slowfall effect resets player jumping flag
+    Bug #4778: Interiors of Illusion puzzle in Sotha Sil Expanded mod is broken
+    Bug #4783: Blizzard behavior is incorrect
+    Bug #4787: Sneaking makes 1st person walking/bobbing animation super-slow
+    Bug #4797: Player sneaking and running stances are not accounted for when in air
+    Bug #4800: Standing collisions are not updated immediately when an object is teleported without a cell change
+    Bug #4802: You can rest before taking falling damage from landing from a jump
+    Bug #4803: Stray special characters before begin statement break script compilation
+    Bug #4804: Particle system with the "Has Sizes = false" causes an exception
+    Bug #4805: NPC movement speed calculations do not take race Weight into account
+    Bug #4810: Raki creature broken in OpenMW
+    Bug #4813: Creatures with known file but no "Sound Gen Creature" assigned use default sounds
+    Bug #4815: "Finished" journal entry with lower index doesn't close journal, SetJournalIndex closes journal
+    Bug #4820: Spell absorption is broken
+    Bug #4823: Jail progress bar works incorrectly
+    Bug #4826: Uninitialized memory in unit test
+    Bug #4827: NiUVController is handled incorrectly
+    Bug #4828: Potion looping effects VFX are not shown for NPCs
+    Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded
+    Bug #4841: Russian localization ignores implicit keywords
+    Bug #4844: Data race in savegame loading / GlobalMap render
+    Bug #4847: Idle animation reset oddities
+    Bug #4851: No shadows since switch to OSG
+    Bug #4860: Actors outside of processing range visible for one frame after spawning
+    Bug #4867: Arbitrary text after local variable declarations breaks script compilation
+    Bug #4876: AI ratings handling inconsistencies
+    Bug #4877: Startup script executes only on a new game start
+    Bug #4879: SayDone returns 0 on the frame Say is called
+    Bug #4888: Global variable stray explicit reference calls break script compilation
+    Bug #4896: Title screen music doesn't loop
+    Bug #4902: Using scrollbars in settings causes resolution to change
+    Bug #4904: Editor: Texture painting with duplicate of a base-version texture
+    Bug #4911: Editor: QOpenGLContext::swapBuffers() warning with Qt5
+    Bug #4916: Specular power (shininess) material parameter is ignored when shaders are used.
+    Bug #4918: Abilities don't play looping VFX when they're initially applied
+    Bug #4920: Combat AI uses incorrect invisibility check
+    Bug #4922: Werewolves can not attack if the transformation happens during attack
+    Bug #4927: Spell effect having both a skill and an attribute assigned is a fatal error
+    Bug #4932: Invalid records matching when loading save with edited plugin
+    Bug #4933: Field of View not equal with Morrowind
+    Bug #4938: Strings from subrecords with actually empty headers can't be empty
+    Bug #4942: Hand-to-Hand attack type is chosen randomly when "always use best attack" is turned off
+    Bug #4945: Poor random magic magnitude distribution
+    Bug #4947: Player character doesn't use lip animation
+    Bug #4948: Footstep sounds while levitating on ground level
+    Bug #4952: Torches held by NPCs flicker too quickly
+    Bug #4961: Flying creature combat engagement takes z-axis into account
+    Bug #4963: Enchant skill progress is incorrect
+    Bug #4964: Multiple effect spell projectile sounds play louder than vanilla
+    Bug #4965: Global light attenuation settings setup is lacking
+    Bug #4969: "Miss" sound plays for any actor
+    Bug #4972: Player is able to use quickkeys while disableplayerfighting is active
+    Bug #4979: AiTravel maximum range depends on "actors processing range" setting
+    Bug #4980: Drowning mechanics is applied for actors indifferently from distance to player
+    Bug #4984: "Friendly hits" feature should be used only for player's followers
+    Bug #4989: Object dimension-dependent VFX scaling behavior is inconsistent
+    Bug #4990: Dead bodies prevent you from hitting
+    Bug #4991: Jumping occasionally takes too much fatigue
+    Bug #4999: Drop instruction behaves differently from vanilla
+    Bug #5001: Possible data race in the Animation::setAlpha()
+    Bug #5004: Werewolves shield their eyes during storm
+    Bug #5012: "Take all" on owned container generates a messagebox per item
+    Bug #5018: Spell tooltips don't support purely negative magnitudes
+    Bug #5025: Data race in the ICO::setMaximumNumOfObjectsToCompilePerFrame()
+    Bug #5028: Offered price caps are not trading-specific
+    Bug #5038: Enchanting success chance calculations are blatantly wrong
+    Bug #5047: # in cell names sets color
+    Bug #5050: Invalid spell effects are not handled gracefully
+    Bug #5055: Mark, Recall, Intervention magic effect abilities have no effect when added and removed in the same frame
+    Bug #5056: Calling Cast function on player doesn't equip the spell but casts it
+    Bug #5059: Modded animation with combined attack keys always does max damage and can double damage
+    Bug #5060: Magic effect visuals stop when death animation begins instead of when it ends
+    Bug #5063: Shape named "Tri Shadow" in creature mesh is visible if it isn't hidden
+    Bug #5067: Ranged attacks on unaware opponents ("critical hits") differ from the vanilla engine
+    Bug #5069: Blocking creatures' attacks doesn't degrade shields
+    Bug #5073: NPCs open doors in front of them even if they don't have to
+    Bug #5074: Paralyzed actors greet the player
+    Bug #5075: Enchanting cast style can be changed if there's no object
+    Bug #5078: DisablePlayerLooking is broken
+    Bug #5081: OpenMW-CS: Apparatus type "Alembic" is erroneously named "Albemic"
+    Bug #5082: Scrolling with controller in GUI mode is broken
+    Bug #5087: Some valid script names can't be used as string arguments
+    Bug #5089: Swimming/Underwater creatures only swim around ground level
+    Bug #5092: NPCs with enchanted weapons play sound when out of charges
+    Bug #5093: Hand to hand sound plays on knocked out enemies
+    Bug #5097: String arguments can't be parsed as number literals in scripts
+    Bug #5099: Non-swimming enemies will enter water if player is water walking
+    Bug #5103: Sneaking state behavior is still inconsistent
+    Bug #5104: Black Dart's enchantment doesn't trigger at low Enchant levels
+    Bug #5106: Still can jump even when encumbered
+    Bug #5110: ModRegion with a redundant numerical argument breaks script execution
+    Bug #5112: Insufficient magicka for current spell not reflected on HUD icon
+    Bug #5113: Unknown alchemy question mark not centered
+    Bug #5123: Script won't run on respawn
+    Bug #5124: Arrow remains attached to actor if pulling animation was cancelled
+    Bug #5126: Swimming creatures without RunForward animations are motionless during combat
+    Bug #5134: Doors rotation by "Lock" console command is inconsistent
+    Bug #5136: LegionUniform script: can not access local variables
+    Bug #5137: Textures with Clamp Mode set to Clamp instead of Wrap are too dark outside the boundaries
+    Bug #5138: Actors stuck in half closed door
+    Bug #5149: Failing lock pick attempts isn't always a crime
+    Bug #5155: Lock/unlock behavior differs from vanilla
+    Bug #5158: Objects without a name don't fallback to their ID
+    Bug #5159: NiMaterialColorController can only control the diffuse color
+    Bug #5161: Creature companions can't be activated when they are knocked down
+    Bug #5163: UserData is not copied during node cloning
+    Bug #5164: Faction owned items handling is incorrect
+    Bug #5166: Scripts still should be executed after player's death
+    Bug #5167: Player can select and cast spells before magic menu is enabled
+    Bug #5168: Force1stPerson and Force3rdPerson commands are not really force view change
+    Bug #5169: Nested levelled items/creatures have significantly higher chance not to spawn
+    Bug #5175: Random script function returns an integer value
+    Bug #5177: Editor: Unexplored map tiles get corrupted after a file with terrain is saved
+    Bug #5182: OnPCEquip doesn't trigger on skipped beast race attempts to equip something not equippable by beasts
+    Bug #5186: Equipped item enchantments don't affect creatures
+    Bug #5190: On-strike enchantments can be applied to and used with non-projectile ranged weapons
+    Bug #5196: Dwarven ghosts do not use idle animations
+    Bug #5206: A "class does not have NPC stats" error when player's follower kills an enemy with damage spell
+    Bug #5209: Spellcasting ignores race height
+    Bug #5210: AiActivate allows actors to open dialogue and inventory windows
+    Bug #5211: Screen fades in if the first loaded save is in interior cell
+    Bug #5212: AiTravel does not work for actors outside of AI processing range
+    Bug #5213: SameFaction script function is broken
+    Bug #5218: Crash when disabling ToggleBorders
+    Bug #5220: GetLOS crashes when actor isn't loaded
+    Bug #5222: Empty cell name subrecords are not saved
+    Bug #5223: Bow replacement during attack animation removes attached arrow
+    Bug #5226: Reputation should be capped
+    Bug #5229: Crash if mesh controller node has no data node
+    Bug #5239: OpenMW-CS does not support non-ASCII characters in path names
+    Bug #5241: On-self absorb spells cannot be detected
+    Bug #5242: ExplodeSpell behavior differs from Cast behavior
+    Bug #5246: Water ripples persist after cell change
+    Bug #5249: Wandering NPCs start walking too soon after they hello
+    Bug #5250: Creatures display shield ground mesh instead of shield body part
+    Bug #5255: "GetTarget, player" doesn't return 1 during NPC hello
+    Bug #5261: Creatures can sometimes become stuck playing idles and never wander again
+    Bug #5264: "Damage Fatigue" Magic Effect Can Bring Fatigue below 0
+    Bug #5269: Editor: Cell lighting in resaved cleaned content files is corrupted
+    Bug #5278: Console command Show doesn't fall back to global variable after local var not found
+    Bug #5308: World map copying makes save loading much slower
+    Bug #5313: Node properties of identical type are not applied in the correct order
+    Bug #5326: Formatting issues in the settings.cfg
+    Bug #5328: Skills aren't properly reset for dead actors
+    Bug #5345: Dopey Necromancy does not work due to a missing quote
+    Bug #5350: An attempt to launch magic bolt causes "AL error invalid value" error
+    Bug #5352: Light source items' duration is decremented while they aren't visible
+    Feature #1724: Handle AvoidNode
+    Feature #2229: Improve pathfinding AI
+    Feature #3025: Analogue gamepad movement controls
+    Feature #3442: Default values for fallbacks from ini file
+    Feature #3517: Multiple projectiles enchantment
+    Feature #3610: Option to invert X axis
+    Feature #3871: Editor: Terrain Selection
+    Feature #3893: Implicit target for "set" function in console
+    Feature #3980: In-game option to disable controller
+    Feature #3999: Shift + Double Click should maximize/restore menu size
+    Feature #4001: Toggle sneak controller shortcut
+    Feature #4068: OpenMW-CS: Add a button to reset key bindings to defaults
+    Feature #4129: Beta Comment to File
+    Feature #4202: Open .omwaddon files without needing to open openmw-cs first
+    Feature #4209: Editor: Faction rank sub-table
+    Feature #4255: Handle broken RepairedOnMe script function
+    Feature #4316: Implement RaiseRank/LowerRank functions properly
+    Feature #4360: Improve default controller bindings
+    Feature #4544: Actors movement deceleration
+    Feature #4673: Weapon sheathing
+    Feature #4675: Support for NiRollController
+    Feature #4708: Radial fog support
+    Feature #4730: Native animated containers support
+    Feature #4784: Launcher: Duplicate Content Lists
+    Feature #4812: Support NiSwitchNode
+    Feature #4831: Item search in the player's inventory
+    Feature #4836: Daytime node switch
+    Feature #4840: Editor: Transient terrain change support
+    Feature #4859: Make water reflections more configurable
+    Feature #4882: Support for NiPalette node
+    Feature #4887: Add openmw command option to set initial random seed
+    Feature #4890: Make Distant Terrain configurable
+    Feature #4944: Pause audio when OpenMW is minimized
+    Feature #4958: Support eight blood types
+    Feature #4962: Add casting animations for magic items
+    Feature #4968: Scalable UI widget skins
+    Feature #4971: OpenMW-CS: Make rotations display as degrees instead of radians
+    Feature #4994: Persistent pinnable windows hiding
+    Feature #5000: Compressed BSA format support
+    Feature #5005: Editor: Instance window via Scene window
+    Feature #5010: Native graphics herbalism support
+    Feature #5031: Make GetWeaponType function return different values for tools
+    Feature #5033: Magic armor mitigation for creatures
+    Feature #5034: Make enchanting window stay open after a failed attempt
+    Feature #5036: Allow scripted faction leaving
+    Feature #5046: Gamepad thumbstick cursor speed
+    Feature #5051: Provide a separate textures for scrollbars
+    Feature #5091: Human-readable light source duration
+    Feature #5094: Unix like console hotkeys
+    Feature #5098: Allow user controller bindings
+    Feature #5114: Refresh launcher mod list
+    Feature #5121: Handle NiTriStrips and NiTriStripsData
+    Feature #5122: Use magic glow for enchanted arrows
+    Feature #5131: Custom skeleton bones
+    Feature #5132: Unique animations for different weapon types
+    Feature #5146: Safe Dispose corpse
+    Feature #5147: Show spell magicka cost in spell buying window
+    Feature #5170: Editor: Land shape editing, land selection
+    Feature #5172: Editor: Delete instances/references with keypress in scene window
+    Feature #5193: Shields sheathing
+    Feature #5201: Editor: Show tool outline in scene view, when using editmodes
+    Feature #5219: Impelement TestCells console command
+    Feature #5224: Handle NiKeyframeController for NiTriShape
+    Feature #5274: Editor: Keyboard shortcut to drop objects to ground/obstacle in scene view
+    Feature #5304: Morrowind-style bump-mapping
+    Feature #5311: Support for gyroscopic input (e.g. Android)
+    Feature #5314: Ingredient filter in the alchemy window
+    Task #4686: Upgrade media decoder to a more current FFmpeg API
+    Task #4695: Optimize Distant Terrain memory consumption
+    Task #4789: Optimize cell transitions
+    Task #4721: Add NMake support to the Windows prebuild script
+
 0.45.0
 ------
 
+    Bug #1875: Actors in inactive cells don't heal from resting
     Bug #1990: Sunrise/sunset not set correct
     Bug #2131: Lustidrike's spell misses the player every time
     Bug #2222: Fatigue's effect on selling price is backwards
+    Bug #2256: Landing sound not playing when jumping immediately after landing
+    Bug #2274: Thin platform clips through player character instead of lifting
     Bug #2326: After a bound item expires the last equipped item of that type is not automatically re-equipped
+    Bug #2446: Restore Attribute/Skill should allow restoring drained attributes
     Bug #2455: Creatures attacks degrade armor
     Bug #2562: Forcing AI to activate a teleport door sometimes causes a crash
     Bug #2626: Resurrecting the player does not resume the game
@@ -14,14 +486,27 @@
     Bug #2862: [macOS] Can't quit launcher using Command-Q or OpenMW->Quit
     Bug #2872: Tab completion in console doesn't work with explicit reference
     Bug #2971: Compiler did not reject lines with naked expressions beginning with x.y
+    Bug #3049: Drain and Fortify effects are not properly applied on health, magicka and fatigue
+    Bug #3059: Unable to hit with marksman weapons when too close to an enemy
+    Bug #3072: Fatal error on AddItem <item> that has a script containing Equip <item>
+    Bug #3219: NPC and creature initial position tracing down limit is too small
     Bug #3249: Fixed revert function not updating views properly
+    Bug #3288: TrueType fonts are handled incorrectly
     Bug #3374: Touch spells not hitting kwama foragers
     Bug #3486: [Mod] NPC Commands does not work
+    Bug #3533: GetSpellEffects should detect effects with zero duration
     Bug #3591: Angled hit distance too low
     Bug #3629: DB assassin attack never triggers creature spawning
+    Bug #3681: OpenMW-CS: Clicking Scripts in Preferences spawns many color pickers
+    Bug #3762: AddSoulGem and RemoveSpell redundant count arguments break script execution
+    Bug #3788: GetPCInJail and GetPCTraveling do not work as in vanilla
+    Bug #3836: Script fails to compile when command argument contains "\n"
     Bug #3876: Landscape texture painting is misaligned
+    Bug #3890: Magic light source attenuation is inaccurate
     Bug #3897: Have Goodbye give all choices the effects of Goodbye
     Bug #3911: [macOS] Typing in the "Content List name" dialog box produces double characters
+    Bug #3920: RemoveSpellEffects doesn't remove constant effects
+    Bug #3948: AiCombat moving target aiming uses incorrect speed for magic projectiles
     Bug #3950: FLATTEN_STATIC_TRANSFORMS optimization breaks animated collision shapes
     Bug #3993: Terrain texture blending map is not upscaled
     Bug #3997: Almalexia doesn't pace
@@ -30,21 +515,28 @@
     Bug #4110: Fixed undo / redo menu text losing the assigned shortcuts
     Bug #4125: OpenMW logo cropped on bugtracker
     Bug #4215: OpenMW shows book text after last EOL tag
+    Bug #4217: Fixme implementation differs from Morrowind's
     Bug #4221: Characters get stuck in V-shaped terrain
     Bug #4230: AiTravel package issues break some Tribunal quests
+    Bug #4231: Infected rats from the "Crimson Plague" quest rendered unconscious by change in Drain Fatigue functionality
     Bug #4251: Stationary NPCs do not return to their position after combat
+    Bug #4260: Keyboard navigation makes persuasion exploitable
+    Bug #4271: Scamp flickers when attacking
     Bug #4274: Pre-0.43 death animations are not forward-compatible with 0.43+
     Bug #4286: Scripted animations can be interrupted
     Bug #4291: Non-persistent actors that started the game as dead do not play death animations
+    Bug #4292: CenterOnCell implementation differs from vanilla
     Bug #4293: Faction members are not aware of faction ownerships in barter
+    Bug #4304: "Follow" not working as a second AI package
     Bug #4307: World cleanup should remove dead bodies only if death animation is finished
     Bug #4311: OpenMW does not handle RootCollisionNode correctly
     Bug #4327: Missing animations during spell/weapon stance switching
+    Bug #4333: Keyboard navigation in containers is not intuitive
     Bug #4358: Running animation is interrupted when magic mode is toggled
     Bug #4368: Settings window ok button doesn't have key focus by default
     Bug #4378: On-self absorb spells restore stats
     Bug #4393: NPCs walk back to where they were after using ResetActors
-    Bug #4416: Handle exception if we try to play non-music file
+    Bug #4416: Non-music files crash the game when they are tried to be played
     Bug #4419: MRK NiStringExtraData is handled incorrectly
     Bug #4426: RotateWorld behavior is incorrect
     Bug #4429: [Windows] Error on build INSTALL.vcxproj project (debug) with cmake 3.7.2
@@ -60,8 +552,11 @@
     Bug #4459: NotCell dialogue condition doesn't support partial matches
     Bug #4460: Script function "Equip" doesn't bypass beast restrictions
     Bug #4461: "Open" spell from non-player caster isn't a crime
+    Bug #4463: %g format doesn't return more digits
     Bug #4464: OpenMW keeps AiState cached storages even after we cancel AI packages
+    Bug #4467: Content selector: cyrillic characters are decoded incorrectly in plugin descriptions
     Bug #4469: Abot Silt Striders – Model turn 90 degrees on horizontal
+    Bug #4470: Non-bipedal creatures with Weapon & Shield flag have inconsistent behaviour
     Bug #4474: No fallback when getVampireHead fails
     Bug #4475: Scripted animations should not cause movement
     Bug #4479: "Game" category on Advanced page is getting too long
@@ -75,19 +570,64 @@
     Bug #4503: Cast and ExplodeSpell commands increase alteration skill
     Bug #4510: Division by zero in MWMechanics::CreatureStats::setAttribute
     Bug #4519: Knockdown does not discard movement in the 1st-person mode
+    Bug #4527: Sun renders on water shader in some situations where it shouldn't
+    Bug #4531: Movement does not reset idle animations
+    Bug #4532: Underwater sfx isn't tied to 3rd person camera
     Bug #4539: Paper Doll is affected by GUI scaling
+    Bug #4543: Picking cursed items through inventory (menumode) makes it disappear
     Bug #4545: Creatures flee from werewolves
     Bug #4551: Replace 0 sound range with default range separately
     Bug #4553: Forcegreeting on non-actor opens a dialogue window which cannot be closed
     Bug #4557: Topics with reserved names are handled differently from vanilla
     Bug #4558: Mesh optimizer: check for reserved node name is case-sensitive
+    Bug #4560: OpenMW does not update pinned windows properly
     Bug #4563: Fast travel price logic checks destination cell instead of service actor cell
     Bug #4565: Underwater view distance should be limited
     Bug #4573: Player uses headtracking in the 1st-person mode
     Bug #4574: Player turning animations are twitchy
     Bug #4575: Weird result of attack animation blending with movement animations
     Bug #4576: Reset of idle animations when attack can not be started
+    Bug #4591: Attack strength should be 0 if player did not hold the attack button
+    Bug #4593: Editor: Instance dragging is broken
+    Bug #4597: <> operator causes a compile error
+    Bug #4604: Picking up gold from the ground only makes 1 grabbed
+    Bug #4607: Scaling for animated collision shapes is applied twice
+    Bug #4608: Falling damage is applied twice
+    Bug #4611: Instant magic effects have 0 duration in custom spell cost calculations unlike vanilla
+    Bug #4614: Crash due to division by zero when FlipController has no textures
+    Bug #4615: Flicker effects for light sources are handled incorrectly
+    Bug #4617: First person sneaking offset is not applied while the character is in air
+    Bug #4618: Sneaking is possible while the character is flying
+    Bug #4622: Recharging enchanted items with Soul Gems does not award experience if it fails
+    Bug #4628: NPC record reputation, disposition and faction rank should have unsigned char type
+    Bug #4633: Sneaking stance affects speed even if the actor is not able to crouch
+    Bug #4641: GetPCJumping is handled incorrectly
+    Bug #4644: %Name should be available for all actors, not just for NPCs
+    Bug #4646: Weapon force-equipment messes up ongoing attack animations
+    Bug #4648: Hud thinks that throwing weapons have condition
+    Bug #4649: Levelup fully restores health
+    Bug #4653: Length of non-ASCII strings is handled incorrectly in ESM reader
+    Bug #4654: Editor: UpdateVisitor does not initialize skeletons for animated objects
+    Bug #4656: Combat AI: back up behaviour is incorrect
+    Bug #4668: Editor: Light source color is displayed as an integer
+    Bug #4669: ToggleCollision should trace the player down after collision being enabled
+    Bug #4671: knownEffect functions should use modified Alchemy skill
+    Bug #4672: Pitch factor is handled incorrectly for crossbow animations
+    Bug #4674: Journal can be opened when settings window is open
+    Bug #4677: Crash in ESM reader when NPC record has DNAM record without DODT one
+    Bug #4678: Crash in ESP parser when SCVR has no variable names
+    Bug #4684: Spell Absorption is additive
+    Bug #4685: Missing sound causes an exception inside Say command
+    Bug #4689: Default creature soundgen entries are not used
+    Bug #4691: Loading bar for cell should be moved up when text is still active at bottom of screen
+    Feature #912: Editor: Add missing icons to UniversalId tables
+    Feature #1221: Editor: Creature/NPC rendering
+    Feature #1617: Editor: Enchantment effect record verifier
+    Feature #1645: Casting effects from objects
     Feature #2606: Editor: Implemented (optional) case sensitive global search
+    Feature #2787: Use the autogenerated collision box, if the creature mesh has no predefined one
+    Feature #2845: Editor: add record view and preview default keybindings
+    Feature #2847: Content selector: allow to copy the path to a file by using the context menu
     Feature #3083: Play animation when NPC is casting spell via script
     Feature #3103: Provide option for disposition to get increased by successful trade
     Feature #3276: Editor: Search - Show number of (remaining) search results and indicate a search without any results
@@ -96,6 +636,7 @@
     Feature #4012: Editor: Write a log file if OpenCS crashes
     Feature #4222: 360° screenshots
     Feature #4256: Implement ToggleBorders (TB) console command
+    Feature #4285: Support soundgen calls for activators
     Feature #4324: Add CFBundleIdentifier in Info.plist to allow for macOS function key shortcuts
     Feature #4345: Add equivalents for the command line commands to Launcher
     Feature #4404: Editor: All EnumDelegate fields should have their items sorted alphabetically
@@ -107,8 +648,26 @@
     Feature #4548: Weapon priority: use the actual chance to hit the target instead of weapon skill
     Feature #4549: Weapon priority: use the actual damage in weapon rating calculations
     Feature #4550: Weapon priority: make ranged weapon bonus more sensible
+    Feature #4579: Add option for applying Strength into hand to hand damage
+    Feature #4581: Use proper logging system
+    Feature #4624: Spell priority: don't cast hit chance-affecting spells if the enemy is not in respective stance at the moment
+    Feature #4625: Weapon priority: use weighted mean for melee damage rating
+    Feature #4626: Weapon priority: account for weapon speed
+    Feature #4632: AI priority: utilize vanilla AI GMSTs for priority rating
+    Feature #4636: Use sTo GMST in spellmaking menu
+    Feature #4642: Batching potion creation
+    Feature #4647: Cull actors outside of AI processing range
+    Feature #4682: Use the collision box from basic creature mesh if the X one have no collisions
+    Feature #4697: Use the real thrown weapon damage in tooltips and AI
     Task #2490: Don't open command prompt window on Release-mode builds automatically
     Task #4545: Enable is_pod string test
+    Task #4605: Optimize skinning
+    Task #4606: Support Rapture3D's OpenAL driver
+    Task #4613: Incomplete type errors when compiling with g++ on OSX 10.9
+    Task #4621: Optimize combat AI
+    Task #4643: Revise editor record verifying functionality
+    Task #4645: Use constants instead of widely used magic numbers
+    Task #4652: Move call to enemiesNearby() from InputManager::rest() to World::canRest()
 
 0.44.0
 ------

CHANGELOG_PR.md

@@ -0,0 +1,53 @@
+*** PLEASE PUT YOUR ISSUE DESCRIPTION FOR DUMMIES HERE FOR REVIEW ***
+
+- I'm just a placeholder description (#1337)
+- I'm also just a placeholder description, but I'm a more recent one (#42)
+
+***
+
+0.47.0
+------
+
+The OpenMW team is proud to announce the release of version 0.47.0! Grab it from our Downloads Page for all operating systems. ***short summary: XXX ***
+
+Check out the release video (***add link***) and the OpenMW-CS release video (***add link***) by the ***add flattering adjective*** Atahualpa, and see below for the full list of changes.
+
+Known Issues:
+- To use generic Linux binaries, Qt4 and libpng12 must be installed on your system
+- On macOS, launching OpenMW from OpenMW-CS requires OpenMW.app and OpenMW-CS.app to be siblings
+
+New Features:
+- Dialogue to split item stacks now displays the name of the trapped soul for stacks of soul gems (#5362)
+- Basics of Collada animations are now supported via osgAnimation plugin (#5456)
+
+New Editor Features:
+- Instance selection modes are now implemented (centred cube, corner-dragged cube, sphere) with four user-configurable actions (select only, add to selection, remove from selection, invert selection) (#3171)
+
+Bug Fixes:
+- NiParticleColorModifier in NIF files is now properly handled which solves issues regarding particle effects, e.g., smoke and fire (#1952, #3676)
+- Targetting non-unique actors in scripts is now supported (#2311)
+- Guards no longer ignore attacks of invisible players but rather initiate dialogue and flee if the player resists being arrested (#4774)
+- Changing the dialogue window without closing it no longer clears the dialogue history in order to allow, e.g., emulation of three-way dialogue via ForceGreeting (#5358)
+- Scripts which try to start a non-existent global script now skip that step and continue execution instead of breaking (#5364)
+- Selecting already equipped spells or magic items via hotkey no longer triggers the equip sound to play (#5367)
+- 'Scale' argument in levelled creature lists is now taken into account when spawning creatures from such lists (#5369)
+- Morrowind legacy madness: Using a key on a trapped door/container now only disarms the trap if the door/container is locked (#5370)
+
+Editor Bug Fixes:
+- Deleted and moved objects within a cell are now saved properly (#832)
+- Disabled record sorting in Topic and Journal Info tables, implemented drag-move for records (#4357)
+- Topic and Journal Info records can now be cloned with a different parent Topic/Journal Id (#4363)
+- Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
+- Cell borders are now properly redrawn when undoing/redoing terrain changes (#5473)
+- Loading mods now keeps the master index (#5675)
+- Flicker and crashing on XFCE4 fixed (#5703)
+- Collada models render properly in the Editor (#5713)
+- Terrain-selection grid is now properly updated when undoing/redoing terrain changes (#6022)
+- Tool outline and select/edit actions in "Terrain land editing" mode now ignore references (#6023)
+- Primary-select and secondary-select actions in "Terrain land editing" mode now behave like in "Instance editing" mode (#6024)
+- Using the circle brush to select terrain in the "Terrain land editing" mode no longer selects vertices outside the circle (#6035)
+- Vertices at the NW and SE corners of a cell can now also be selected in "Terrain land editing" mode if the adjacent cells aren't loaded yet (#6036)
+
+Miscellaneous:
+- Prevent save-game bloating by using an appropriate fog texture format (#5108)
+- Ensure that 'Enchantment autocalc" flag is treated as flag in OpenMW-CS and in our esm tools (#5363)

CI/ActivateMSVC.ps1

@@ -0,0 +1,28 @@
+& "${env:COMSPEC}" /c ActivateMSVC.bat "&&" set | ForEach-Object {
+    if ($_.Contains("=")) {
+        $name, $value = $_ -split '=', 2
+        Set-Content env:\"$name" $value
+    }
+}
+
+$MissingTools = $false
+$tools = "cl", "link", "rc", "mt"
+$descriptions = "MSVC Compiler", "MSVC Linker", "MS Windows Resource Compiler", "MS Windows Manifest Tool"
+for ($i = 0; $i -lt $tools.Length; $i++) {
+    $present = $true
+    try {
+        Get-Command $tools[$i] *>&1 | Out-Null
+        $present = $present -and $?
+    } catch {
+        $present = $false
+    }
+    if (!$present) {
+        Write-Warning "$($tools[$i]) ($($descriptions[$i])) missing."
+        $MissingTools = $true
+    }
+}
+
+if ($MissingTools) {
+    Write-Error "Some build tools were unavailable after activating MSVC in the shell. It's likely that your Visual Studio $MSVC_DISPLAY_YEAR installation needs repairing."
+    exit 1
+}

CI/activate_msvc.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+oldSettings=$-
+set -eu
+
+function restoreOldSettings {
+    if [[ $oldSettings != *e* ]]; then
+        set +e
+    fi
+    if [[ $oldSettings != *u* ]]; then
+        set +u
+    fi
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    echo "Error: Script not sourced."
+    echo "You must source this script for it to work, i.e. "
+    echo "source ./activate_msvc.sh"
+    echo "or"
+    echo ". ./activate_msvc.sh"
+    restoreOldSettings
+    exit 1
+fi
+
+command -v unixPathAsWindows >/dev/null 2>&1 || function unixPathAsWindows {
+	if command -v cygpath >/dev/null 2>&1; then
+		cygpath -w $1
+	else
+		echo "$1" | sed "s,^/\([^/]\)/,\\1:/," | sed "s,/,\\\\,g"
+	fi
+}
+
+
+# capture CMD environment in a shell with MSVC activated
+cmd //c "$(unixPathAsWindows "$(dirname "${BASH_SOURCE[0]}")")\ActivateMSVC.bat" "&&" "bash" "-c" "declare -px > declared_env.sh"
+source ./declared_env.sh
+rm declared_env.sh
+
+MISSINGTOOLS=0
+
+command -v cl >/dev/null 2>&1 || { echo "Error: cl (MSVC Compiler) missing."; MISSINGTOOLS=1; }
+command -v link >/dev/null 2>&1 || { echo "Error: link (MSVC Linker) missing."; MISSINGTOOLS=1; }
+command -v rc >/dev/null 2>&1 || { echo "Error: rc (MS Windows Resource Compiler) missing."; MISSINGTOOLS=1; }
+command -v mt >/dev/null 2>&1 || { echo "Error: mt (MS Windows Manifest Tool) missing."; MISSINGTOOLS=1; }
+
+if [ $MISSINGTOOLS -ne 0 ]; then
+    echo "Some build tools were unavailable after activating MSVC in the shell. It's likely that your Visual Studio $MSVC_DISPLAY_YEAR installation needs repairing."
+    restoreOldSettings
+    return 1
+fi
+
+restoreOldSettings

CI/before_install.android.sh

@@ -0,0 +1,4 @@
+#!/bin/sh -ex
+
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201129.zip -o ~/openmw-android-deps.zip
+unzip -o ~/openmw-android-deps -d /usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null

CI/before_install.linux.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -ex
 echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
 
 # Set up compilers
@@ -6,17 +6,8 @@ if [ ! -z "${MATRIX_CC}" ]; then
     eval "${MATRIX_CC}"
 fi
 
-# build libgtest & libgtest_main
-sudo mkdir /usr/src/gtest/build
-cd /usr/src/gtest/build
-sudo cmake .. -DBUILD_SHARED_LIBS=1
-sudo make -j4
-sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
-sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
-
 cd ~/
 git clone https://github.com/TES3MP/CrabNet
 cd CrabNet
 cmake . -DCRABNET_ENABLE_DLL=OFF -DCRABNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release
 make -j3
-

CI/before_install.osx.sh

@@ -1,10 +1,22 @@
-#!/bin/sh
+#!/bin/sh -ex
 
-brew update
+# workaround python issue on travis
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
 
-brew outdated cmake || brew upgrade cmake
-brew outdated pkgconfig || brew upgrade pkgconfig
-brew install qt
+# Some of these tools can come from places other than brew, so check before installing
+command -v ccache >/dev/null 2>&1 || brew install ccache
+command -v cmake >/dev/null 2>&1 || brew install cmake
+command -v qmake >/dev/null 2>&1 || brew install qt@5
+export PATH="/usr/local/opt/qt@5/bin:$PATH"  # needed to use qmake in none default path as qt now points to qt6
 
-curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip
+ccache --version
+cmake --version
+qmake --version
+
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210617.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
+
+# additional libraries
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig

CI/before_script.android.sh

@@ -0,0 +1,27 @@
+#!/bin/sh -ex
+
+# hack to work around: FFmpeg version is too old, 3.2 is required
+sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
+
+mkdir -p build
+cd build
+
+cmake \
+-DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake \
+-DANDROID_ABI=arm64-v8a \
+-DANDROID_PLATFORM=android-21 \
+-DCMAKE_C_COMPILER_LAUNCHER=ccache \
+-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+-DCMAKE_INSTALL_PREFIX=install \
+-DBUILD_BSATOOL=0 \
+-DBUILD_NIFTEST=0 \
+-DBUILD_ESMTOOL=0 \
+-DBUILD_LAUNCHER=0 \
+-DBUILD_MWINIIMPORTER=0 \
+-DBUILD_ESSIMPORTER=0 \
+-DBUILD_OPENCS=0 \
+-DBUILD_WIZARD=0 \
+-DOPENMW_USE_SYSTEM_MYGUI=OFF \
+-DOPENMW_USE_SYSTEM_OSG=OFF \
+-DOPENMW_USE_SYSTEM_BULLET=OFF \
+..

CI/before_script.linux.sh

@@ -1,7 +1,42 @@
-#!/bin/sh
+#!/bin/bash
+
+set -xeo pipefail
 
 free -m
-mkdir build
+
+BUILD_UNITTESTS=OFF
+BUILD_BENCHMARKS=OFF
+
+if [[ "${BUILD_TESTS_ONLY}" ]]; then
+    export GOOGLETEST_DIR="${PWD}/googletest/build/install"
+    env GENERATOR='Unix Makefiles' CONFIGURATION=Release CI/build_googletest.sh
+    BUILD_UNITTESTS=ON
+    BUILD_BENCHMARKS=ON
+fi
+
+declare -a CMAKE_CONF_OPTS=(
+    -DCMAKE_C_COMPILER="${CC:-/usr/bin/cc}"
+    -DCMAKE_CXX_COMPILER="${CXX:-/usr/bin/c++}"
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+    -DCMAKE_INSTALL_PREFIX=install
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo
+    -DBUILD_SHARED_LIBS=OFF
+    -DUSE_SYSTEM_TINYXML=ON
+    -DCMAKE_INSTALL_PREFIX=install
+    -DRakNet_LIBRARY_RELEASE=~/CrabNet/lib/libRakNetLibStatic.a
+    -DRakNet_LIBRARY_DEBUG=~/CrabNet/lib/libRakNetLibStatic.a
+)
+
+if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
+    CMAKE_CONF_OPTS+=(
+        -DOPENMW_USE_SYSTEM_MYGUI=OFF
+        -DOPENMW_USE_SYSTEM_OSG=OFF
+        -DOPENMW_USE_SYSTEM_BULLET=OFF
+    )
+fi
+
+mkdir -p build
 cd build
 
 # Set up compilers
@@ -11,29 +46,26 @@ fi
 
 export RAKNET_ROOT=~/CrabNet
 
-export CODE_COVERAGE=0
-if [ ! -z "${ANALYZE}" ]; then
-    CODE_COVERAGE=1
+if [[ "${BUILD_TESTS_ONLY}" ]]; then
+    ${ANALYZE} cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        -DBUILD_OPENMW=OFF \
+        -DBUILD_OPENMW_MP=OFF \
+        -DBUILD_BSATOOL=OFF \
+        -DBUILD_ESMTOOL=OFF \
+        -DBUILD_LAUNCHER=OFF \
+        -DBUILD_BROWSER=OFF \
+        -DBUILD_MWINIIMPORTER=OFF \
+        -DBUILD_ESSIMPORTER=OFF \
+        -DBUILD_OPENCS=OFF \
+        -DBUILD_WIZARD=OFF \
+        -DBUILD_UNITTESTS=${BUILD_UNITTESTS} \
+        -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
+        -DGTEST_ROOT="${GOOGLETEST_DIR}" \
+        -DGMOCK_ROOT="${GOOGLETEST_DIR}" \
+        ..
+else
+    ${ANALYZE} cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        ..
 fi
-
-${ANALYZE}cmake .. \
-    -DDESIRED_QT_VERSION=5 \
-    -DBUILD_OPENMW_MP=ON \
-    -DBUILD_BROWSER=ON \
-    -DBUILD_MASTER=ON \
-    -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} \
-    -DBUILD_BSATOOL=OFF \
-    -DBUILD_ESMTOOL=OFF \
-    -DBUILD_ESSIMPORTER=OFF \
-    -DBUILD_LAUNCHER=OFF \
-    -DBUILD_MWINIIMPORTER=OFF \
-    -DBUILD_MYGUI_PLUGIN=OFF \
-    -DBUILD_OPENCS=OFF \
-    -DBUILD_WIZARD=OFF \
-    -DBUILD_UNITTESTS=1 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBINDIR=/usr/games \
-    -DCMAKE_BUILD_TYPE="None" \
-    -DUSE_SYSTEM_TINYXML=TRUE \
-    -DRakNet_LIBRARY_RELEASE=~/CrabNet/lib/libRakNetLibStatic.a \
-    -DRakNet_LIBRARY_DEBUG=~/CrabNet/lib/libRakNetLibStatic.a

CI/before_script.osx.sh

@@ -1,21 +1,29 @@
-#!/bin/sh
+#!/bin/sh -e
 
 export CXX=clang++
 export CC=clang
 
 DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
-QT_PATH=`brew --prefix qt`
+QT_PATH=$(brew --prefix qt@5)
+CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
 mkdir build
 cd build
 
 cmake \
 -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
--D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
--D CMAKE_OSX_SYSROOT="macosx10.13" \
--D CMAKE_BUILD_TYPE=Release \
+-D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
+-D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
+-D CMAKE_CXX_FLAGS="-stdlib=libc++" \
+-D CMAKE_C_FLAGS_RELEASE="-g -O0" \
+-D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
+-D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
+-D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
--D DESIRED_QT_VERSION=5 \
--D BUILD_ESMTOOL=FALSE \
--D BUILD_MYGUI_PLUGIN=FALSE \
+-D BUILD_OPENMW=TRUE \
+-D BUILD_OPENCS=TRUE \
+-D BUILD_ESMTOOL=TRUE \
+-D BUILD_BSATOOL=TRUE \
+-D BUILD_ESSIMPORTER=TRUE \
+-D BUILD_NIFTEST=TRUE \
 -G"Unix Makefiles" \
 ..

CI/build_googletest.sh

@@ -0,0 +1,17 @@
+#!/bin/sh -ex
+
+git clone -b release-1.10.0 https://github.com/google/googletest.git
+cd googletest
+mkdir build
+cd build
+cmake \
+    -D CMAKE_C_COMPILER="${CC}" \
+    -D CMAKE_CXX_COMPILER="${CXX}" \
+    -D CMAKE_C_COMPILER_LAUNCHER=ccache \
+    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -D CMAKE_BUILD_TYPE="${CONFIGURATION}" \
+    -D CMAKE_INSTALL_PREFIX="${GOOGLETEST_DIR}" \
+    -G "${GENERATOR}" \
+    ..
+cmake --build . --config "${CONFIGURATION}" -- -j $(nproc)
+cmake --install . --config "${CONFIGURATION}"

CI/check_package.osx.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+hdiutil attach ./*.dmg -mountpoint "${TRAVIS_BUILD_DIR}/openmw-package" > /dev/null || echo "hdutil has failed"
+
+EXPECTED_PACKAGE_FILES=('Applications' 'OpenMW-CS.app' 'OpenMW.app')
+PACKAGE_FILES=$(ls "${TRAVIS_BUILD_DIR}/openmw-package" | LC_ALL=C sort)
+
+DIFF=$(diff <(printf "%s\n" "${EXPECTED_PACKAGE_FILES[@]}") <(printf "%s\n" "${PACKAGE_FILES[@]}"))
+DIFF_STATUS=$?
+
+if [[ $DIFF_STATUS -ne 0 ]]; then
+  echo "The package should only contain an Applications symlink and two applications, see the following diff for details." >&2
+  echo "$DIFF" >&2
+  exit 1
+fi

CI/deploy.osx.sh

@@ -1,11 +1,26 @@
 #!/bin/sh
 
-cd build
+# This script expect the following environment variables to be set:
+# - OSX_DEPLOY_KEY: private SSH key, must be encoded like this before adding it to Travis secrets: https://github.com/travis-ci/travis-ci/issues/7715#issuecomment-433301692
+# - OSX_DEPLOY_HOST: string specifying SSH of the following format: ssh-user@ssh-host
+# - OSX_DEPLOY_PORT: SSH port, it can't be a part of the host string because scp doesn't accept hosts with ports
+# - OSX_DEPLOY_HOST_FINGERPRINT: fingerprint of the host, can be obtained by using ssh-keygen -F [host]:port & putting it in double quotes when adding to Travis secrets
 
-DATE=`date +'%d%m%Y'`
-SHORT_COMMIT=`git rev-parse --short ${TRAVIS_COMMIT}`
+SSH_KEY_PATH="$HOME/.ssh/openmw_deploy"
+REMOTE_PATH="\$HOME/nightly"
+
+echo "$OSX_DEPLOY_KEY" > "$SSH_KEY_PATH"
+chmod 600 "$SSH_KEY_PATH"
+echo "$OSX_DEPLOY_HOST_FINGERPRINT" >> "$HOME/.ssh/known_hosts"
+
+cd build || exit 1
+
+DATE=$(date +'%d%m%Y')
+SHORT_COMMIT=$(git rev-parse --short "${TRAVIS_COMMIT}")
 TARGET_FILENAME="OpenMW-${DATE}-${SHORT_COMMIT}.dmg"
 
-if ! curl --ssl -u $OSX_FTP_USER:$OSX_FTP_PASSWORD "${OSX_FTP_URL}" --silent | grep $SHORT_COMMIT > /dev/null; then
-    curl --ssl --ftp-create-dirs -T *.dmg -u $OSX_FTP_USER:$OSX_FTP_PASSWORD "${OSX_FTP_URL}${TARGET_FILENAME}"
+if ! ssh -p "$OSX_DEPLOY_PORT" -i "$SSH_KEY_PATH" "$OSX_DEPLOY_HOST" "ls \"$REMOTE_PATH\"" | grep "$SHORT_COMMIT" > /dev/null; then
+    scp -P "$OSX_DEPLOY_PORT" -i "$SSH_KEY_PATH" ./*.dmg "$OSX_DEPLOY_HOST:$REMOTE_PATH/$TARGET_FILENAME"
+else
+    echo "An existing nightly build for commit ${SHORT_COMMIT} has been found, skipping upload."
 fi

CI/install_debian_deps.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -euo pipefail
+
+print_help() {
+  echo "usage: $0 [group]..."
+  echo
+  echo "  available groups: "${!GROUPED_DEPS[@]}""
+}
+
+declare -rA GROUPED_DEPS=(
+  [gcc]="binutils gcc g++ libc-dev"
+  [clang]="binutils clang"
+
+  # Common dependencies for building OpenMW.
+  [openmw-deps]="
+    make cmake ccache git pkg-config
+
+    libboost-filesystem-dev libboost-program-options-dev
+    libboost-system-dev libboost-iostreams-dev
+    
+    libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
+    libsdl2-dev libqt5opengl5-dev libopenal-dev libunshield-dev libtinyxml-dev
+    libbullet-dev liblz4-dev libpng-dev libjpeg-dev
+    ca-certificates
+  "
+  # TODO: add librecastnavigation-dev when debian is ready
+
+  # These dependencies can alternatively be built and linked statically.
+  [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev"
+  [coverity]="curl"
+
+  # Pre-requisites for building MyGUI and OSG for static linking.
+  #
+  # * MyGUI and OSG: libsdl2-dev liblz4-dev libfreetype6-dev
+  # * OSG: libgl-dev
+  #
+  #   Plugins:
+  #   * DAE: libcollada-dom-dev libboost-system-dev libboost-filesystem-dev
+  #   * JPEG: libjpeg-dev
+  #   * PNG: libpng-dev
+  [openmw-deps-static]="
+    make cmake
+    ccache curl unzip libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
+    libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
+  "
+)
+
+if [[ $# -eq 0 ]]; then
+  >&2 print_help
+  exit 1
+fi
+
+deps=()
+for group in "$@"; do
+  if [[ ! -v GROUPED_DEPS[$group] ]]; then
+    >&2 echo "error: unknown group ${group}"
+    exit 1
+  fi
+  deps+=(${GROUPED_DEPS[$group]})
+done
+
+export APT_CACHE_DIR="${PWD}/apt-cache"
+set -x
+mkdir -pv "$APT_CACHE_DIR"
+apt-get update -yq
+apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Pull Request Guidelines
 
 To facilitate the review process, your pull request description should include the following, if applicable:
 
-* A link back to the bug report or forum discussion that prompted the change. Note: when linking bugs, use the syntax ```[Bug #xyz](https://bugs.openmw.org/issues/#xyz)``` to create a clickable link. Writing only 'Bug #xyz' will unfortunately create a link to the Github pull request with that number instead.
+* A link back to the bug report or forum discussion that prompted the change. Note: when linking bugs, use the syntax ```[Bug #xyz](https://gitlab.com/OpenMW/openmw/issues/#xyz)``` to create a clickable link. Writing only 'Bug #xyz' will unfortunately create a link to the Github pull request with that number instead.
 * Summary of the changes made
 * Reasoning / motivation behind the change
 * What testing you have carried out to verify the change

LICENSE

@@ -620,55 +620,62 @@ copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+ADDITIONAL TERMS APPLICABLE TO THE TES3MP GPL Source Code.
+
+  The following additional terms ("Additional Terms") supplement and modify
+the GNU General Public License, Version 3 ("GPL") applicable to the TES3MP
+GPL Source Code ("TES3MP Source Code").  In addition to the terms and conditions
+of the GPL, the TES3MP Source Code is subject to the further restrictions below.
+
+1. Replacement of Section 15.  Section 15 of the GPL shall be deleted in its
+entirety and replaced with the following:
+
+"15. Disclaimer of Warranty.  
+
+THE PROGRAM IS PROVIDED WITHOUT ANY WARRANTIES, WHETHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT, TITLE AND MERCHANTABILITY.  THE PROGRAM IS BEING
+DELIVERED OR MADE AVAILABLE "AS IS", "WITH ALL FAULTS" AND WITHOUT WARRANTY OR
+REPRESENTATION.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST
+OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+
+2. Replacement of Section 16.  Section 16 of the GPL shall be deleted in its
+entirety and replaced with the following:
+
+"16.  LIMITATION OF LIABILITY.  
+
+UNDER NO CIRCUMSTANCES SHALL ANY COPYRIGHT HOLDER OR ITS AFFILIATES, OR ANY
+OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, FOR ANY
+DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE USE OR INABILITY TO USE THE PROGRAM OR OTHER DEALINGS WITH
+THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), WHETHER OR NOT ANY COPYRIGHT
+HOLDER OR SUCH OTHER PARTY RECEIVES NOTICE OF ANY SUCH DAMAGES AND WHETHER
+OR NOT SUCH DAMAGES COULD HAVE BEEN FORESEEN."
+
+3. LEGAL NOTICES; NO TRADEMARK LICENSE; ORIGIN.  You must reproduce faithfully
+all trademark, copyright and other proprietary and legal notices on any copies
+of the Program or any other required author attributions.  This license does
+not grant you rights to use any copyright holder or any other party's name,
+logo, or trademarks.  Neither the name of the copyright holder or its
+affiliates, or any other party who modifies and/or conveys the Program may be
+used to endorse or promote products derived from this software without
+specific prior written permission.  The origin of the Program must not be
+misrepresented; you must not claim that you wrote the original Program.
+
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original Program.
+
+4. INDEMNIFICATION.  IF YOU CONVEY A COVERED WORK AND AGREE WITH ANY RECIPIENT
+OF THAT COVERED WORK THAT YOU WILL ASSUME ANY LIABILITY FOR THAT COVERED WORK,
+YOU HEREBY AGREE TO INDEMNIFY, DEFEND AND HOLD HARMLESS THE OTHER LICENSORS
+AND AUTHORS OF THAT COVERED WORK FOR ANY DAMAEGS, DEMANDS, CLAIMS, LOSSES,
+CAUSES OF ACTION, LAWSUITS, JUDGMENTS EXPENSES (INCLUDING WITHOUT LIMITATION
+REASONABLE ATTORNEYS' FEES AND EXPENSES) OR ANY OTHER LIABLITY ARISING FROM,
+RELATED TO OR IN CONNECTION WITH YOUR ASSUMPTIONS OF LIABILITY.

README.md

@@ -2,27 +2,25 @@ TES3MP
 ======
 
 Copyright (c) 2008-2015, OpenMW Team  
-Copyright (c) 2016-2019, Stanislav Zhukov & David Cernat
-
-[![Build Status](https://travis-ci.org/TES3MP/openmw-tes3mp.svg?branch=0.7.0)](https://travis-ci.org/TES3MP/openmw-tes3mp)
+Copyright (c) 2016-2022, David Cernat & Stanislav Zhukov
 
 TES3MP is a project adding multiplayer functionality to [OpenMW](https://github.com/OpenMW/openmw), an open-source game engine that supports playing "The Elder Scrolls III: Morrowind" by Bethesda Softworks.
 
-* TES3MP version: 0.7.0-alpha
-* OpenMW version: 0.44.0
-* License: GPLv3 (see [LICENSE](https://github.com/TES3MP/openmw-tes3mp/blob/master/LICENSE) for more information)
+* TES3MP version: 0.8.1
+* OpenMW version: 0.47.0
+* License: GPLv3 with additional allowed terms (see [LICENSE](https://github.com/TES3MP/TES3MP/blob/master/LICENSE) for more information)
 
 Font Licenses:
-* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVu Font License.txt](https://github.com/TES3MP/openmw-tes3mp/blob/master/files/mygui/DejaVu%20Font%20License.txt) for more information)
+* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://github.com/TES3MP/TES3MP/blob/master/files/mygui/DejaVuFontLicense.txt) for more information)
 
 Project status
 --------------
 
-[Version changelog](https://github.com/TES3MP/openmw-tes3mp/blob/master/tes3mp-changelog.md)
+[Version changelog](https://github.com/TES3MP/TES3MP/blob/master/tes3mp-changelog.md)
 
-As of version 0.7.0, TES3MP is fully playable, providing very extensive player, NPC, world and quest synchronization, as well as state saving and loading, all of which are highly customizable via [serverside Lua scripts](https://github.com/TES3MP/CoreScripts).
+As of version 0.8.0, TES3MP is fully playable, providing very extensive player, NPC, world and quest synchronization, as well as state saving and loading, all of which are highly customizable via [serverside Lua scripts](https://github.com/TES3MP/CoreScripts).
 
-Remaining gameplay problems mostly relate to AI and the synchronization of clientside script variables.
+Remaining gameplay problems mostly relate to AI and the fact that clientside script variables need to be placed on a synchronization whitelist to avoid packet spam.
 
 Donations
 ---------------
@@ -36,14 +34,14 @@ Helping us with documentation, bug hunting and video showcases is always greatly
 
 For code contributions, it's best to start out with modestly sized fixes and features and work your way up. There are so many different possible implementations of more major features – many of which would cause undesirable code or vision conflicts with OpenMW – that those should be talked over in advance with the existing developers before effort is spent on them.
 
-Feel free to contact the [team members](https://github.com/TES3MP/openmw-tes3mp/blob/master/tes3mp-credits.md) for any questions you might have.
+Feel free to contact the [team members](https://github.com/TES3MP/TES3MP/blob/master/tes3mp-credits.md) for any questions you might have.
 
 Getting started
 ---------------
 
-* [Quickstart guide](https://github.com/TES3MP/openmw-tes3mp/wiki/Quickstart-guide)
+* [Quickstart guide](https://github.com/TES3MP/TES3MP/wiki/Quickstart-guide)
 * [Steam group](https://steamcommunity.com/groups/mwmulti) and its [detailed FAQ](https://steamcommunity.com/groups/mwmulti/discussions/1/353916184342480541/)
 * [TES3MP section on OpenMW forums](https://forum.openmw.org/viewforum.php?f=45)
 * [Discord server](https://discord.gg/ECJk293)
 * [Subreddit](https://www.reddit.com/r/tes3mp)
-* [Known issues and bug reports](https://github.com/TES3MP/openmw-tes3mp/issues)
+* [Known issues and bug reports](https://github.com/TES3MP/TES3MP/issues)

apps/benchmarks/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.11)
+
+set(BENCHMARK_ENABLE_TESTING OFF)
+set(BENCHMARK_ENABLE_INSTALL OFF)
+set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+
+set(SAVED_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+string(REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+string(REPLACE "-Wundef" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+include(FetchContent)
+FetchContent_Declare(benchmark
+    URL https://github.com/google/benchmark/archive/refs/tags/v1.5.2.zip
+    URL_HASH MD5=49395b757a7c4656d70f1328d93efd00
+    SOURCE_DIR fetched/benchmark
+)
+FetchContent_MakeAvailableExcludeFromAll(benchmark)
+
+set(CMAKE_CXX_FLAGS "${SAVED_CMAKE_CXX_FLAGS}")
+
+openmw_add_executable(openmw_detournavigator_navmeshtilescache_benchmark detournavigator/navmeshtilescache.cpp)
+target_compile_features(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE cxx_std_17)
+target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark benchmark::benchmark components)
+
+if (UNIX AND NOT APPLE)
+    target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark ${CMAKE_THREAD_LIBS_INIT})
+endif()

apps/benchmarks/detournavigator/navmeshtilescache.cpp

@@ -0,0 +1,214 @@
+#include <benchmark/benchmark.h>
+
+#include <components/detournavigator/navmeshtilescache.hpp>
+
+#include <algorithm>
+#include <random>
+#include <iostream>
+
+namespace
+{
+    using namespace DetourNavigator;
+
+    struct Key
+    {
+        osg::Vec3f mAgentHalfExtents;
+        TilePosition mTilePosition;
+        RecastMesh mRecastMesh;
+        std::vector<OffMeshConnection> mOffMeshConnections;
+    };
+
+    struct Item
+    {
+        Key mKey;
+        NavMeshData mValue;
+    };
+
+    template <typename Random>
+    TilePosition generateTilePosition(int max, Random& random)
+    {
+        std::uniform_int_distribution<int> distribution(0, max);
+        return TilePosition(distribution(random), distribution(random));
+    }
+
+    template <typename Random>
+    osg::Vec3f generateAgentHalfExtents(float min, float max, Random& random)
+    {
+        std::uniform_int_distribution<int> distribution(min, max);
+        return osg::Vec3f(distribution(random), distribution(random), distribution(random));
+    }
+
+    template <typename OutputIterator, typename Random>
+    void generateVertices(OutputIterator out, std::size_t number, Random& random)
+    {
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        std::generate_n(out, 3 * (number - number % 3), [&] { return distribution(random); });
+    }
+
+    template <typename OutputIterator, typename Random>
+    void generateIndices(OutputIterator out, int max, std::size_t number, Random& random)
+    {
+        std::uniform_int_distribution<int> distribution(0, max);
+        std::generate_n(out, number - number % 3, [&] { return distribution(random); });
+    }
+
+    AreaType toAreaType(int index)
+    {
+        switch (index)
+        {
+            case 0: return AreaType_null;
+            case 1: return AreaType_water;
+            case 2: return AreaType_door;
+            case 3: return AreaType_pathgrid;
+            case 4: return AreaType_ground;
+        }
+        return AreaType_null;
+    }
+
+    template <typename Random>
+    AreaType generateAreaType(Random& random)
+    {
+        std::uniform_int_distribution<int> distribution(0, 4);
+        return toAreaType(distribution(random));;
+    }
+
+    template <typename OutputIterator, typename Random>
+    void generateAreaTypes(OutputIterator out, std::size_t triangles, Random& random)
+    {
+        std::generate_n(out, triangles, [&] { return generateAreaType(random); });
+    }
+
+    template <typename OutputIterator, typename Random>
+    void generateWater(OutputIterator out, std::size_t count, Random& random)
+    {
+        std::uniform_real_distribution<btScalar> distribution(0.0, 1.0);
+        std::generate_n(out, count, [&] {
+            const btVector3 shift(distribution(random), distribution(random), distribution(random));
+            return RecastMesh::Water {1, btTransform(btMatrix3x3::getIdentity(), shift)};
+        });
+    }
+
+    template <typename OutputIterator, typename Random>
+    void generateOffMeshConnection(OutputIterator out, std::size_t count, Random& random)
+    {
+        std::uniform_real_distribution<btScalar> distribution(0.0, 1.0);
+        std::generate_n(out, count, [&] {
+            const osg::Vec3f start(distribution(random), distribution(random), distribution(random));
+            const osg::Vec3f end(distribution(random), distribution(random), distribution(random));
+            return OffMeshConnection {start, end, generateAreaType(random)};
+        });
+    }
+
+    template <class Random>
+    Key generateKey(std::size_t triangles, Random& random)
+    {
+        const osg::Vec3f agentHalfExtents = generateAgentHalfExtents(0.5, 1.5, random);
+        const TilePosition tilePosition = generateTilePosition(10000, random);
+        const std::size_t generation = std::uniform_int_distribution<std::size_t>(0, 100)(random);
+        const std::size_t revision = std::uniform_int_distribution<std::size_t>(0, 10000)(random);
+        std::vector<float> vertices;
+        generateVertices(std::back_inserter(vertices), triangles * 1.98, random);
+        std::vector<int> indices;
+        generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.53, random);
+        std::vector<AreaType> areaTypes;
+        generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
+        std::vector<RecastMesh::Water> water;
+        generateWater(std::back_inserter(water), 2, random);
+        RecastMesh recastMesh(generation, revision, std::move(indices), std::move(vertices),
+                              std::move(areaTypes), std::move(water));
+        std::vector<OffMeshConnection> offMeshConnections;
+        generateOffMeshConnection(std::back_inserter(offMeshConnections), 300, random);
+        return Key {agentHalfExtents, tilePosition, std::move(recastMesh), std::move(offMeshConnections)};
+    }
+
+    constexpr std::size_t trianglesPerTile = 310;
+
+    template <typename OutputIterator, typename Random>
+    void generateKeys(OutputIterator out, std::size_t count, Random& random)
+    {
+        std::generate_n(out, count, [&] { return generateKey(trianglesPerTile, random); });
+    }
+
+    template <typename OutputIterator, typename Random>
+    void fillCache(OutputIterator out, Random& random, NavMeshTilesCache& cache)
+    {
+        std::size_t size = cache.getStats().mNavMeshCacheSize;
+
+        while (true)
+        {
+            Key key = generateKey(trianglesPerTile, random);
+            cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections, NavMeshData());
+            *out++ = std::move(key);
+            const std::size_t newSize = cache.getStats().mNavMeshCacheSize;
+            if (size >= newSize)
+                break;
+            size = newSize;
+        }
+    }
+
+    template <std::size_t maxCacheSize, int hitPercentage>
+    void getFromFilledCache(benchmark::State& state)
+    {
+        NavMeshTilesCache cache(maxCacheSize);
+        std::minstd_rand random;
+        std::vector<Key> keys;
+        fillCache(std::back_inserter(keys), random, cache);
+        generateKeys(std::back_inserter(keys), keys.size() * (100 - hitPercentage) / 100, random);
+        std::size_t n = 0;
+
+        while (state.KeepRunning())
+        {
+            const auto& key = keys[n++ % keys.size()];
+            const auto result = cache.get(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections);
+            benchmark::DoNotOptimize(result);
+        }
+    }
+
+    constexpr auto getFromFilledCache_1m_100hit = getFromFilledCache<1 * 1024 * 1024, 100>;
+    constexpr auto getFromFilledCache_4m_100hit = getFromFilledCache<4 * 1024 * 1024, 100>;
+    constexpr auto getFromFilledCache_16m_100hit = getFromFilledCache<16 * 1024 * 1024, 100>;
+    constexpr auto getFromFilledCache_64m_100hit = getFromFilledCache<64 * 1024 * 1024, 100>;
+    constexpr auto getFromFilledCache_1m_70hit = getFromFilledCache<1 * 1024 * 1024, 70>;
+    constexpr auto getFromFilledCache_4m_70hit = getFromFilledCache<4 * 1024 * 1024, 70>;
+    constexpr auto getFromFilledCache_16m_70hit = getFromFilledCache<16 * 1024 * 1024, 70>;
+    constexpr auto getFromFilledCache_64m_70hit = getFromFilledCache<64 * 1024 * 1024, 70>;
+
+    template <std::size_t maxCacheSize>
+    void setToBoundedNonEmptyCache(benchmark::State& state)
+    {
+        NavMeshTilesCache cache(maxCacheSize);
+        std::minstd_rand random;
+        std::vector<Key> keys;
+        fillCache(std::back_inserter(keys), random, cache);
+        generateKeys(std::back_inserter(keys), keys.size() * 2, random);
+        std::reverse(keys.begin(), keys.end());
+        std::size_t n = 0;
+
+        while (state.KeepRunning())
+        {
+            const auto& key = keys[n++ % keys.size()];
+            const auto result = cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections, NavMeshData());
+            benchmark::DoNotOptimize(result);
+        }
+    }
+
+    constexpr auto setToBoundedNonEmptyCache_1m = setToBoundedNonEmptyCache<1 * 1024 * 1024>;
+    constexpr auto setToBoundedNonEmptyCache_4m = setToBoundedNonEmptyCache<4 * 1024 * 1024>;
+    constexpr auto setToBoundedNonEmptyCache_16m = setToBoundedNonEmptyCache<16 * 1024 * 1024>;
+    constexpr auto setToBoundedNonEmptyCache_64m = setToBoundedNonEmptyCache<64 * 1024 * 1024>;
+} // namespace
+
+BENCHMARK(getFromFilledCache_1m_100hit);
+BENCHMARK(getFromFilledCache_4m_100hit);
+BENCHMARK(getFromFilledCache_16m_100hit);
+BENCHMARK(getFromFilledCache_64m_100hit);
+BENCHMARK(getFromFilledCache_1m_70hit);
+BENCHMARK(getFromFilledCache_4m_70hit);
+BENCHMARK(getFromFilledCache_16m_70hit);
+BENCHMARK(getFromFilledCache_64m_70hit);
+BENCHMARK(setToBoundedNonEmptyCache_1m);
+BENCHMARK(setToBoundedNonEmptyCache_4m);
+BENCHMARK(setToBoundedNonEmptyCache_16m);
+BENCHMARK(setToBoundedNonEmptyCache_64m);
+
+BENCHMARK_MAIN();

apps/browser/MainWindow.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 06.01.17.
-//
-
 #include "MainWindow.hpp"
 #include "QueryHelper.hpp"
 #include "PingHelper.hpp"

apps/browser/MainWindow.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 06.01.17.
-//
-
 #ifndef NEWLAUNCHER_MAIN_HPP
 #define NEWLAUNCHER_MAIN_HPP
 

apps/browser/MySortFilterProxyModel.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 30.01.17.
-//
-
 #include "MySortFilterProxyModel.hpp"
 #include "ServerModel.hpp"
 

apps/browser/MySortFilterProxyModel.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 30.01.17.
-//
-
 #ifndef OPENMW_MYSORTFILTERPROXYMODEL_HPP
 #define OPENMW_MYSORTFILTERPROXYMODEL_HPP
 

apps/browser/PingHelper.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.05.17.
-//
-
 #include "PingHelper.hpp"
 #include "ServerModel.hpp"
 #include <QDebug>

apps/browser/PingHelper.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.05.17.
-//
-
 #ifndef OPENMW_PINGHELPER_HPP
 #define OPENMW_PINGHELPER_HPP
 

apps/browser/PingUpdater.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 02.05.17.
-//
-
 #include "PingUpdater.hpp"
 #include "netutils/Utils.hpp"
 #include <QDebug>

apps/browser/PingUpdater.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 02.05.17.
-//
-
 #ifndef OPENMW_PINGUPDATER_HPP
 #define OPENMW_PINGUPDATER_HPP
 

apps/browser/QueryHelper.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 27.05.17.
-//
-
 #include "netutils/QueryClient.hpp"
 #include "netutils/Utils.hpp"
 #include "QueryHelper.hpp"

apps/browser/QueryHelper.hpp

@@ -1,8 +1,3 @@
-//
-// Created by koncord on 27.05.17.
-//
-
-
 #ifndef OPENMW_QUERYHELPER_HPP
 #define OPENMW_QUERYHELPER_HPP
 

apps/browser/ServerInfoDialog.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #include <apps/browser/netutils/QueryClient.hpp>
 #include "qdebug.h"
 

apps/browser/ServerInfoDialog.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #ifndef NEWLAUNCHER_SERVERINFODIALOG_HPP
 #define NEWLAUNCHER_SERVERINFODIALOG_HPP
 

apps/browser/Types.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.05.17.
-//
-
 #ifndef OPENMW_TYPES_HPP
 #define OPENMW_TYPES_HPP
 

apps/browser/main.cpp

@@ -13,9 +13,9 @@ std::string loadSettings (Settings::Manager & settings)
 
     // prefer local
     if (boost::filesystem::exists(localdefault))
-        settings.loadDefault(localdefault);
+        settings.loadDefault(localdefault, false);
     else if (boost::filesystem::exists(globaldefault))
-        settings.loadDefault(globaldefault);
+        settings.loadDefault(globaldefault, false);
     else
         throw std::runtime_error ("No default settings file found! Make sure the file \"tes3mp-client-default.cfg\" was properly installed.");
 

apps/browser/netutils/HTTPNetwork.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #include <RakPeer.h>
 #include <HTTPConnection2.h>
 #include <TCPInterface.h>

apps/browser/netutils/HTTPNetwork.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #ifndef NEWLAUNCHER_HTTPNETWORK_HPP
 #define NEWLAUNCHER_HTTPNETWORK_HPP
 

apps/browser/netutils/QueryClient.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 24.04.17.
-//
-
 #include "QueryClient.hpp"
 #include <RakSleep.h>
 #include <components/openmw-mp/NetworkMessages.hpp>

apps/browser/netutils/QueryClient.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 24.04.17.
-//
-
 #ifndef OPENMW_QUERYCLIENT_HPP
 #define OPENMW_QUERYCLIENT_HPP
 

apps/browser/netutils/Utils.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #include <RakPeer.h>
 #include <MessageIdentifiers.h>
 #include <RakSleep.h>

apps/browser/netutils/Utils.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 07.01.17.
-//
-
 #ifndef NEWLAUNCHER_PING_HPP
 #define NEWLAUNCHER_PING_HPP
 

apps/bsatool/bsatool.cpp

@@ -6,7 +6,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/bsa/bsa_file.hpp>
+#include <components/bsa/compressedbsafile.hpp>
+#include <components/misc/stringops.hpp>
 
 #define BSATOOL_VERSION 1.1
 
@@ -19,22 +20,13 @@ struct Arguments
     std::string mode;
     std::string filename;
     std::string extractfile;
+    std::string addfile;
     std::string outdir;
 
     bool longformat;
     bool fullpath;
 };
 
-void replaceAll(std::string& str, const std::string& needle, const std::string& substitute)
-{
-    size_t pos = str.find(needle);
-    while(pos != std::string::npos)
-    {
-        str.replace(pos, needle.size(), substitute);
-        pos = str.find(needle);
-    }
-}
-
 bool parseOptions (int argc, char** argv, Arguments &info)
 {
     bpo::options_description desc("Inspect and extract files from Bethesda BSA archives\n\n"
@@ -45,6 +37,10 @@ bool parseOptions (int argc, char** argv, Arguments &info)
             "      Extract a file from the input archive.\n\n"
             "  bsatool extractall archivefile [output_directory]\n"
             "      Extract all files from the input archive.\n\n"
+            "  bsatool add [-a] archivefile file_to_add\n"
+            "      Add a file to the input archive.\n\n"
+            "  bsatool create [-c] archivefile\n"
+            "      Create an archive.\n\n"
             "Allowed options");
 
     desc.add_options()
@@ -104,7 +100,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     }
 
     info.mode = variables["mode"].as<std::string>();
-    if (!(info.mode == "list" || info.mode == "extract" || info.mode == "extractall"))
+    if (!(info.mode == "list" || info.mode == "extract" || info.mode == "extractall" || info.mode == "add" || info.mode == "create"))
     {
         std::cout << std::endl << "ERROR: invalid mode \"" << info.mode << "\"\n\n"
             << desc << std::endl;
@@ -135,6 +131,17 @@ bool parseOptions (int argc, char** argv, Arguments &info)
         if (variables["input-file"].as< std::vector<std::string> >().size() > 2)
             info.outdir = variables["input-file"].as< std::vector<std::string> >()[2];
     }
+    else if (info.mode == "add")
+    {
+        if (variables["input-file"].as< std::vector<std::string> >().size() < 1)
+        {
+            std::cout << "\nERROR: file to add unspecified\n\n"
+                << desc << std::endl;
+            return false;
+        }
+        if (variables["input-file"].as< std::vector<std::string> >().size() > 1)
+            info.addfile = variables["input-file"].as< std::vector<std::string> >()[1];
+    }
     else if (variables["input-file"].as< std::vector<std::string> >().size() > 1)
         info.outdir = variables["input-file"].as< std::vector<std::string> >()[1];
 
@@ -144,9 +151,10 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     return true;
 }
 
-int list(Bsa::BSAFile& bsa, Arguments& info);
-int extract(Bsa::BSAFile& bsa, Arguments& info);
-int extractAll(Bsa::BSAFile& bsa, Arguments& info);
+int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
+int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
+int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
+int add(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
 
 int main(int argc, char** argv)
 {
@@ -157,8 +165,22 @@ int main(int argc, char** argv)
             return 1;
 
         // Open file
-        Bsa::BSAFile bsa;
-        bsa.open(info.filename);
+        std::unique_ptr<Bsa::BSAFile> bsa;
+
+        Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(info.filename);
+
+        if (bsaVersion == Bsa::BSAVER_COMPRESSED)
+            bsa = std::make_unique<Bsa::CompressedBSAFile>(Bsa::CompressedBSAFile());
+        else
+            bsa = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
+
+        if (info.mode == "create")
+        {
+            bsa->open(info.filename);
+            return 0;
+        }
+
+        bsa->open(info.filename);
 
         if (info.mode == "list")
             return list(bsa, info);
@@ -166,6 +188,8 @@ int main(int argc, char** argv)
             return extract(bsa, info);
         else if (info.mode == "extractall")
             return extractAll(bsa, info);
+        else if (info.mode == "add")
+            return add(bsa, info);
         else
         {
             std::cout << "Unsupported mode. That is not supposed to happen." << std::endl;
@@ -179,37 +203,37 @@ int main(int argc, char** argv)
     }
 }
 
-int list(Bsa::BSAFile& bsa, Arguments& info)
+int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
 {
     // List all files
-    const Bsa::BSAFile::FileList &files = bsa.getList();
-    for(unsigned int i=0; i<files.size(); i++)
+    const Bsa::BSAFile::FileList &files = bsa->getList();
+    for (const auto& file : files)
     {
         if(info.longformat)
         {
             // Long format
             std::ios::fmtflags f(std::cout.flags());
-            std::cout << std::setw(50) << std::left << files[i].name;
-            std::cout << std::setw(8) << std::left << std::dec << files[i].fileSize;
-            std::cout << "@ 0x" << std::hex << files[i].offset << std::endl;
+            std::cout << std::setw(50) << std::left << file.name();
+            std::cout << std::setw(8) << std::left << std::dec << file.fileSize;
+            std::cout << "@ 0x" << std::hex << file.offset << std::endl;
             std::cout.flags(f);
         }
         else
-            std::cout << files[i].name << std::endl;
+            std::cout << file.name() << std::endl;
     }
 
     return 0;
 }
 
-int extract(Bsa::BSAFile& bsa, Arguments& info)
+int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
 {
     std::string archivePath = info.extractfile;
-    replaceAll(archivePath, "/", "\\");
+    Misc::StringUtils::replaceAll(archivePath, "/", "\\");
 
     std::string extractPath = info.extractfile;
-    replaceAll(extractPath, "\\", "/");
+    Misc::StringUtils::replaceAll(extractPath, "\\", "/");
 
-    if (!bsa.exists(archivePath.c_str()))
+    if (!bsa->exists(archivePath.c_str()))
     {
         std::cout << "ERROR: file '" << archivePath << "' not found\n";
         std::cout << "In archive: " << info.filename << std::endl;
@@ -237,7 +261,7 @@ int extract(Bsa::BSAFile& bsa, Arguments& info)
     }
 
     // Get a stream for the file to extract
-    Files::IStreamPtr stream = bsa.getFile(archivePath.c_str());
+    Files::IStreamPtr stream = bsa->getFile(archivePath.c_str());
 
     bfs::ofstream out(target, std::ios::binary);
 
@@ -250,17 +274,12 @@ int extract(Bsa::BSAFile& bsa, Arguments& info)
     return 0;
 }
 
-int extractAll(Bsa::BSAFile& bsa, Arguments& info)
+int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
 {
-    // Get the list of files present in the archive
-    Bsa::BSAFile::FileList list = bsa.getList();
-
-    // Iter on the list
-    for(Bsa::BSAFile::FileList::iterator it = list.begin(); it != list.end(); ++it) {
-        const char* archivePath = it->name;
-
-        std::string extractPath (archivePath);
-        replaceAll(extractPath, "\\", "/");
+    for (const auto &file : bsa->getList())
+    {
+        std::string extractPath(file.name());
+        Misc::StringUtils::replaceAll(extractPath, "\\", "/");
 
         // Get the target path (the path the file will be extracted to)
         bfs::path target (info.outdir);
@@ -278,7 +297,7 @@ int extractAll(Bsa::BSAFile& bsa, Arguments& info)
 
         // Get a stream for the file to extract
         // (inefficient because getFile iter on the list again)
-        Files::IStreamPtr data = bsa.getFile(archivePath);
+        Files::IStreamPtr data = bsa->getFile(file.name());
         bfs::ofstream out(target, std::ios::binary);
 
         // Write the file to disk
@@ -289,3 +308,11 @@ int extractAll(Bsa::BSAFile& bsa, Arguments& info)
 
     return 0;
 }
+
+int add(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
+{
+    boost::filesystem::fstream stream(info.addfile, std::ios_base::binary | std::ios_base::out | std::ios_base::in);
+    bsa->addFile(info.addfile, stream);
+
+    return 0;
+}

apps/esmtool/esmtool.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include <deque>
 #include <list>
+#include <unordered_set>
 #include <map>
 #include <set>
 #include <fstream>
@@ -87,7 +88,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
         ("plain,p", "Print contents of dialogs, books and scripts. "
          "(skipped by default)"
          "Only affects dump mode.")
-        ("quiet,q", "Supress all record information. Useful for speed tests.")
+        ("quiet,q", "Suppress all record information. Useful for speed tests.")
         ("loadcells,C", "Browse through contents of all cells.")
 
         ( "encoding,e", bpo::value<std::string>(&(info.encoding))->
@@ -123,14 +124,9 @@ bool parseOptions (int argc, char** argv, Arguments &info)
 
         bpo::store(valid_opts, variables);
     }
-    catch(boost::program_options::unknown_option & x)
+    catch(std::exception &e)
     {
-        std::cerr << "ERROR: " << x.what() << std::endl;
-        return false;
-    }
-    catch(boost::program_options::invalid_command_line_syntax & x)
-    {
-        std::cerr << "ERROR: " << x.what() << std::endl;
+        std::cout << "ERROR parsing arguments: " << e.what() << std::endl;
         return false;
     }
 
@@ -263,18 +259,37 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
         if(quiet) continue;
 
         std::cout << "    Refnum: " << ref.mRefNum.mIndex << std::endl;
-        std::cout << "    ID: '" << ref.mRefID << "'\n";
-        std::cout << "    Owner: '" << ref.mOwner << "'\n";
-        std::cout << "    Global: '" << ref.mGlobalVariable << "'" << std::endl;
-        std::cout << "    Faction: '" << ref.mFaction << "'" << std::endl;
-        std::cout << "    Faction rank: '" << ref.mFactionRank << "'" << std::endl;
-        std::cout << "    Enchantment charge: '" << ref.mEnchantmentCharge << "'\n";
-        std::cout << "    Uses/health: '" << ref.mChargeInt << "'\n";
-        std::cout << "    Gold value: '" << ref.mGoldValue << "'\n";
-        std::cout << "    Blocked: '" << static_cast<int>(ref.mReferenceBlocked) << "'" << std::endl;
+        std::cout << "    ID: " << ref.mRefID << std::endl;
+        std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2] << ")" << std::endl;
+        if (ref.mScale != 1.f)
+            std::cout << "    Scale: " << ref.mScale << std::endl;
+        if (!ref.mOwner.empty())
+            std::cout << "    Owner: " << ref.mOwner << std::endl;
+        if (!ref.mGlobalVariable.empty())
+            std::cout << "    Global: " << ref.mGlobalVariable << std::endl;
+        if (!ref.mFaction.empty())
+            std::cout << "    Faction: " << ref.mFaction << std::endl;
+        if (!ref.mFaction.empty() || ref.mFactionRank != -2)
+            std::cout << "    Faction rank: " << ref.mFactionRank << std::endl;
+        std::cout << "    Enchantment charge: " << ref.mEnchantmentCharge << std::endl;
+        std::cout << "    Uses/health: " << ref.mChargeInt << std::endl;
+        std::cout << "    Gold value: " << ref.mGoldValue << std::endl;
+        std::cout << "    Blocked: " << static_cast<int>(ref.mReferenceBlocked) << std::endl;
         std::cout << "    Deleted: " << deleted << std::endl;
         if (!ref.mKey.empty())
-            std::cout << "    Key: '" << ref.mKey << "'" << std::endl;
+            std::cout << "    Key: " << ref.mKey << std::endl;
+        std::cout << "    Lock level: " << ref.mLockLevel << std::endl;
+        if (!ref.mTrap.empty())
+            std::cout << "    Trap: " << ref.mTrap << std::endl;
+        if (!ref.mSoul.empty())
+            std::cout << "    Soul: " << ref.mSoul << std::endl;
+        if (ref.mTeleport)
+        {
+            std::cout << "    Destination position: (" << ref.mDoorDest.pos[0] << ", "
+                      << ref.mDoorDest.pos[1] << ", " << ref.mDoorDest.pos[2] << ")" << std::endl;
+            if (!ref.mDestCell.empty())
+                std::cout << "    Destination cell: " << ref.mDestCell << std::endl;
+        }
     }
 }
 
@@ -308,7 +323,7 @@ int load(Arguments& info)
     std::string filename = info.filename;
     std::cout << "Loading file: " << filename << std::endl;
 
-    std::list<int> skipped;
+    std::unordered_set<uint32_t> skipped;
 
     try {
 
@@ -338,29 +353,29 @@ int load(Arguments& info)
             std::cout << "Author: " << esm.getAuthor() << std::endl
                  << "Description: " << esm.getDesc() << std::endl
                  << "File format version: " << esm.getFVer() << std::endl;
-            std::vector<ESM::Header::MasterData> m = esm.getGameFiles();
-            if (!m.empty())
+            std::vector<ESM::Header::MasterData> masterData = esm.getGameFiles();
+            if (!masterData.empty())
             {
                 std::cout << "Masters:" << std::endl;
-                for(unsigned int i=0;i<m.size();i++)
-                    std::cout << "  " << m[i].name << ", " << m[i].size << " bytes" << std::endl;
+                for(const auto& master : masterData)
+                    std::cout << "  " << master.name << ", " << master.size << " bytes" << std::endl;
             }
         }
 
         // Loop through all records
         while(esm.hasMoreRecs())
         {
-            ESM::NAME n = esm.getRecName();
+            const ESM::NAME n = esm.getRecName();
             uint32_t flags;
             esm.getRecHeader(flags);
 
             EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
-            if (record == 0)
+            if (record == nullptr)
             {
-                if (std::find(skipped.begin(), skipped.end(), n.intval) == skipped.end())
+                if (skipped.count(n.intval) == 0)
                 {
                     std::cout << "Skipping " << n.toString() << " records." << std::endl;
-                    skipped.push_back(n.intval);
+                    skipped.emplace(n.intval);
                 }
 
                 esm.skipRecord();
@@ -411,13 +426,10 @@ int load(Arguments& info)
     } catch(std::exception &e) {
         std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
 
-        typedef std::deque<EsmTool::RecordBase *> RecStore;
-        RecStore &store = info.data.mRecords;
-        for (RecStore::iterator it = store.begin(); it != store.end(); ++it)
-        {
-            delete *it;
-        }
-        store.clear();
+        for (const EsmTool::RecordBase* record : info.data.mRecords)
+            delete record;
+
+        info.data.mRecords.clear();
         return 1;
     }
 
@@ -449,15 +461,12 @@ int clone(Arguments& info)
     std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
 
     int i = 0;
-    typedef std::map<int, int> Stats;
-    Stats &stats = info.data.mRecordStats;
-    for (Stats::iterator it = stats.begin(); it != stats.end(); ++it)
+    for (std::pair<int, int> stat : info.data.mRecordStats)
     {
         ESM::NAME name;
-        name.intval = it->first;
-        int amount = it->second;
+        name.intval = stat.first;
+        int amount = stat.second;
         std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
-
         if (++i % 3 == 0)
             std::cout << std::endl;
     }
@@ -475,18 +484,18 @@ int clone(Arguments& info)
     esm.setVersion(info.data.version);
     esm.setRecordCount (recordCount);
 
-    for (std::vector<ESM::Header::MasterData>::iterator it = info.data.masters.begin(); it != info.data.masters.end(); ++it)
-        esm.addMaster(it->name, it->size);
+    for (const ESM::Header::MasterData &master : info.data.masters)
+        esm.addMaster(master.name, master.size);
 
     std::fstream save(info.outname.c_str(), std::fstream::out | std::fstream::binary);
     esm.save(save);
 
     int saved = 0;
-    typedef std::deque<EsmTool::RecordBase *> Records;
-    Records &records = info.data.mRecords;
-    for (Records::iterator it = records.begin(); it != records.end() && i > 0; ++it)
+    for (EsmTool::RecordBase* record : info.data.mRecords)
     {
-        EsmTool::RecordBase *record = *it;
+        if (i <= 0)
+            break;
+
         const ESM::NAME& typeName = record->getType();
 
         esm.startRecord(typeName.toString(), record->getFlags());
@@ -494,20 +503,17 @@ int clone(Arguments& info)
         record->save(esm);
         if (typeName.intval == ESM::REC_CELL) {
             ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
-            if (!info.data.mCellRefs[ptr].empty()) {
-                typedef std::deque<std::pair<ESM::CellRef, bool> > RefList;
-                RefList &refs = info.data.mCellRefs[ptr];
-                for (RefList::iterator refIt = refs.begin(); refIt != refs.end(); ++refIt)
-                {
-                    refIt->first.save(esm, refIt->second);
-                }
+            if (!info.data.mCellRefs[ptr].empty()) 
+            {
+                for (std::pair<ESM::CellRef, bool> &ref : info.data.mCellRefs[ptr])
+                    ref.first.save(esm, ref.second);
             }
         }
 
         esm.endRecord(typeName.toString());
 
         saved++;
-        int perc = (int)((saved / (float)recordCount)*100);
+        int perc = recordCount == 0 ? 100 : (int)((saved / (float)recordCount)*100);
         if (perc % 10 == 0)
         {
             std::cerr << "\r" << perc << "%";
@@ -533,8 +539,8 @@ int comp(Arguments& info)
     Arguments fileOne;
     Arguments fileTwo;
 
-    fileOne.raw_given = 0;
-    fileTwo.raw_given = 0;
+    fileOne.raw_given = false;
+    fileTwo.raw_given = false;
 
     fileOne.mode = "clone";
     fileTwo.mode = "clone";
@@ -563,8 +569,5 @@ int comp(Arguments& info)
         return 1;
     }
 
-
-
-
     return 0;
 }

apps/esmtool/labels.cpp

@@ -4,6 +4,7 @@
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadcont.hpp>
 #include <components/esm/loadcrea.hpp>
+#include <components/esm/loadench.hpp>
 #include <components/esm/loadlevlist.hpp>
 #include <components/esm/loadligh.hpp>
 #include <components/esm/loadmgef.hpp>
@@ -12,7 +13,7 @@
 #include <components/esm/loadspel.hpp>
 #include <components/esm/loadweap.hpp>
 
-#include <boost/format.hpp>
+#include <components/misc/stringops.hpp>
 
 std::string bodyPartLabel(int idx)
 {
@@ -651,7 +652,7 @@ std::string ruleFunction(int idx)
 
 std::string bodyPartFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::BodyPart::BPF_Female) properties += "Female ";
     if (flags & ESM::BodyPart::BPF_NotPlayable) properties += "NotPlayable ";
@@ -659,13 +660,13 @@ std::string bodyPartFlags(int flags)
                   (ESM::BodyPart::BPF_Female|
                    ESM::BodyPart::BPF_NotPlayable));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string cellFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::Cell::HasWater) properties += "HasWater ";
     if (flags & ESM::Cell::Interior) properties += "Interior ";
@@ -680,13 +681,13 @@ std::string cellFlags(int flags)
                    ESM::Cell::QuasiEx|
                    0x00000040));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string containerFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::Container::Unknown) properties += "Unknown ";
     if (flags & ESM::Container::Organic) properties += "Organic ";
@@ -696,43 +697,49 @@ std::string containerFlags(int flags)
                    ESM::Container::Organic|
                    ESM::Container::Respawn));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string creatureFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
-    if (flags & ESM::Creature::None) properties += "All ";
+    if (flags & ESM::Creature::Base) properties += "Base ";
     if (flags & ESM::Creature::Walks) properties += "Walks ";
     if (flags & ESM::Creature::Swims) properties += "Swims ";
     if (flags & ESM::Creature::Flies) properties += "Flies ";
     if (flags & ESM::Creature::Bipedal) properties += "Bipedal ";
     if (flags & ESM::Creature::Respawn) properties += "Respawn ";
     if (flags & ESM::Creature::Weapon) properties += "Weapon ";
-    if (flags & ESM::Creature::Skeleton) properties += "Skeleton ";
-    if (flags & ESM::Creature::Metal) properties += "Metal ";
     if (flags & ESM::Creature::Essential) properties += "Essential ";
     int unused = (0xFFFFFFFF ^
-                  (ESM::Creature::None|
+                  (ESM::Creature::Base|
                    ESM::Creature::Walks|
                    ESM::Creature::Swims|
                    ESM::Creature::Flies|
                    ESM::Creature::Bipedal|
                    ESM::Creature::Respawn|
                    ESM::Creature::Weapon|
-                   ESM::Creature::Skeleton|
-                   ESM::Creature::Metal|
                    ESM::Creature::Essential));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%02X)", flags);
+    return properties;
+}
+
+std::string enchantmentFlags(int flags)
+{
+    std::string properties;
+    if (flags == 0) properties += "[None] ";
+    if (flags & ESM::Enchantment::Autocalc) properties += "Autocalc ";
+    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc)) properties += "Invalid ";
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string landFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     // The ESM component says that this first four bits are used, but
     // only the first three bits are used as far as I can tell.
     // There's also no enumeration of the bit in the ESM component.
@@ -741,13 +748,13 @@ std::string landFlags(int flags)
     if (flags & 0x00000004) properties += "Unknown3 ";
     if (flags & 0x00000002) properties += "Unknown2 ";
     if (flags & 0xFFFFFFF8) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string itemListFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::ItemLevList::AllLevels) properties += "AllLevels ";
     if (flags & ESM::ItemLevList::Each) properties += "Each ";
@@ -755,24 +762,24 @@ std::string itemListFlags(int flags)
                   (ESM::ItemLevList::AllLevels|
                    ESM::ItemLevList::Each));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string creatureListFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::CreatureLevList::AllLevels) properties += "AllLevels ";
     int unused = (0xFFFFFFFF ^ ESM::CreatureLevList::AllLevels);
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string lightFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::Light::Dynamic) properties += "Dynamic ";
     if (flags & ESM::Light::Fire) properties += "Fire ";
@@ -794,13 +801,13 @@ std::string lightFlags(int flags)
                    ESM::Light::Negative|
                    ESM::Light::OffDefault));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string magicEffectFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::MagicEffect::TargetAttribute) properties += "TargetAttribute ";
     if (flags & ESM::MagicEffect::TargetSkill) properties += "TargetSkill ";
@@ -811,8 +818,10 @@ std::string magicEffectFlags(int flags)
     if (flags & ESM::MagicEffect::CastSelf) properties += "CastSelf ";
     if (flags & ESM::MagicEffect::CastTouch) properties += "CastTouch ";
     if (flags & ESM::MagicEffect::CastTarget) properties += "CastTarget ";
-    if (flags & ESM::MagicEffect::UncappedDamage) properties += "UncappedDamage ";
+    if (flags & ESM::MagicEffect::AppliedOnce) properties += "AppliedOnce ";
+    if (flags & ESM::MagicEffect::Stealth) properties += "Stealth ";
     if (flags & ESM::MagicEffect::NonRecastable) properties += "NonRecastable ";
+    if (flags & ESM::MagicEffect::IllegalDaedra) properties += "IllegalDaedra ";
     if (flags & ESM::MagicEffect::Unreflectable) properties += "Unreflectable ";
     if (flags & ESM::MagicEffect::CasterLinked) properties += "CasterLinked ";
     if (flags & ESM::MagicEffect::AllowSpellmaking) properties += "AllowSpellmaking ";
@@ -820,47 +829,35 @@ std::string magicEffectFlags(int flags)
     if (flags & ESM::MagicEffect::NegativeLight) properties += "NegativeLight ";
 
     if (flags & 0xFFFC0000) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string npcFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
-    // Mythicmods and the ESM component differ.  Mythicmods says
-    // 0x8=None and 0x10=AutoCalc, while our code previously defined
-    // 0x8 as AutoCalc.  The former seems to be correct.  All Bethesda
-    // records have bit 0x8 set.  Previously, suspiciously large portion
-    // of females had autocalc turned off.
-    if (flags & 0x00000008) properties += "Unknown ";
+    if (flags & ESM::NPC::Base) properties += "Base ";
     if (flags & ESM::NPC::Autocalc) properties += "Autocalc ";
     if (flags & ESM::NPC::Female) properties += "Female ";
     if (flags & ESM::NPC::Respawn) properties += "Respawn ";
     if (flags & ESM::NPC::Essential) properties += "Essential ";
-    // These two flags do not appear on any NPCs and may have been
-    // confused with the flags for creatures.
-    if (flags & ESM::NPC::Skeleton) properties += "Skeleton ";
-    if (flags & ESM::NPC::Metal) properties += "Metal ";
     // Whether corpses persist is a bit that is unaccounted for,
-    // however the only unknown bit occurs on ALL records, and
-    // relatively few NPCs have this bit set.
-    int unused = (0xFFFFFFFF ^
-                  (0x00000008|
+    // however relatively few NPCs have this bit set.
+    int unused = (0xFF ^
+                  (ESM::NPC::Base|
                    ESM::NPC::Autocalc|
                    ESM::NPC::Female|
                    ESM::NPC::Respawn|
-                   ESM::NPC::Essential|
-                   ESM::NPC::Skeleton|
-                   ESM::NPC::Metal));
+                   ESM::NPC::Essential));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%02X)", flags);
     return properties;
 }
 
 std::string raceFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     // All races have the playable flag set in Bethesda files.
     if (flags & ESM::Race::Playable) properties += "Playable ";
@@ -869,13 +866,13 @@ std::string raceFlags(int flags)
                   (ESM::Race::Playable|
                    ESM::Race::Beast));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string spellFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     if (flags & ESM::Spell::F_Autocalc) properties += "Autocalc ";
     if (flags & ESM::Spell::F_PCStart) properties += "PCStart ";
@@ -885,13 +882,13 @@ std::string spellFlags(int flags)
                    ESM::Spell::F_PCStart|
                    ESM::Spell::F_Always));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
 
 std::string weaponFlags(int flags)
 {
-    std::string properties = "";
+    std::string properties;
     if (flags == 0) properties += "[None] ";
     // The interpretation of the flags are still unclear to me.
     // Apparently you can't be Silver without being Magical?  Many of
@@ -902,6 +899,6 @@ std::string weaponFlags(int flags)
                   (ESM::Weapon::Magical|
                    ESM::Weapon::Silver));
     if (flags & unused) properties += "Invalid ";
-    properties += str(boost::format("(0x%08X)") % flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }

apps/esmtool/labels.hpp

@@ -49,6 +49,7 @@ std::string bodyPartFlags(int flags);
 std::string cellFlags(int flags);
 std::string containerFlags(int flags);
 std::string creatureFlags(int flags);
+std::string enchantmentFlags(int flags);
 std::string landFlags(int flags);
 std::string creatureListFlags(int flags);
 std::string itemListFlags(int flags);

apps/esmtool/record.cpp

@@ -4,15 +4,15 @@
 #include <iostream>
 #include <sstream>
 
-#include <boost/format.hpp>
+#include <components/misc/stringops.hpp>
 
 namespace
 {
 
-void printAIPackage(ESM::AIPackage p)
+void printAIPackage(const ESM::AIPackage& p)
 {
     std::cout << "  AI Type: " << aiTypeLabel(p.mType)
-              << " (" << boost::format("0x%08X") % p.mType << ")" << std::endl;
+              << " (" << Misc::StringUtils::format("0x%08X", p.mType) << ")" << std::endl;
     if (p.mType == ESM::AI_Wander)
     {
         std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
@@ -46,14 +46,14 @@ void printAIPackage(ESM::AIPackage p)
         std::cout << "    Activate Unknown: " << p.mActivate.mUnk << std::endl;
     }
     else {
-        std::cout << "    BadPackage: " << boost::format("0x%08x") % p.mType << std::endl;
+        std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
     }
 
-    if (p.mCellName != "")
+    if (!p.mCellName.empty())
         std::cout << "    Cell Name: " << p.mCellName << std::endl;
 }
 
-std::string ruleString(ESM::DialInfo::SelectStruct ss)
+std::string ruleString(const ESM::DialInfo::SelectStruct& ss)
 {
     std::string rule = ss.mSelectRule;
 
@@ -64,7 +64,7 @@ std::string ruleString(ESM::DialInfo::SelectStruct ss)
     char indicator = rule[2];
 
     std::string type_str = "INVALID";
-    std::string func_str = str(boost::format("INVALID=%s") % rule.substr(1,3));
+    std::string func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1,3));
     int func;
     std::istringstream iss(rule.substr(2,2));
     iss >> func;
@@ -104,7 +104,7 @@ std::string ruleString(ESM::DialInfo::SelectStruct ss)
     // for all types not qual to one.  If this wasn't true, go back to
     // the error message.
     if (type != '1' && rule[3] != 'X')
-        func_str = str(boost::format("INVALID=%s") % rule.substr(1,3));
+        func_str = Misc::StringUtils::format("INVALID=%s", rule.substr(1,3));
 
     char oper = rule[4];
     std::string oper_str = "??";
@@ -122,51 +122,48 @@ std::string ruleString(ESM::DialInfo::SelectStruct ss)
     std::ostringstream stream;
     stream << ss.mValue;
 
-    std::string result = str(boost::format("%-12s %-32s %2s %s")
-                             % type_str % func_str % oper_str % stream.str());
+    std::string result = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
     return result;
 }
 
-void printEffectList(ESM::EffectList effects)
+void printEffectList(const ESM::EffectList& effects)
 {
     int i = 0;
-    std::vector<ESM::ENAMstruct>::iterator eit;
-    for (eit = effects.mList.begin(); eit != effects.mList.end(); ++eit)
-    {
-        std::cout << "  Effect[" << i << "]: " << magicEffectLabel(eit->mEffectID)
-                  << " (" << eit->mEffectID << ")" << std::endl;
-        if (eit->mSkill != -1)
-            std::cout << "    Skill: " << skillLabel(eit->mSkill)
-                      << " (" << (int)eit->mSkill << ")" << std::endl;
-        if (eit->mAttribute != -1)
-            std::cout << "    Attribute: " << attributeLabel(eit->mAttribute)
-                      << " (" << (int)eit->mAttribute << ")" << std::endl;
-        std::cout << "    Range: " << rangeTypeLabel(eit->mRange)
-                  << " (" << eit->mRange << ")" << std::endl;
+    for (const ESM::ENAMstruct& effect : effects.mList)
+    {
+        std::cout << "  Effect[" << i << "]: " << magicEffectLabel(effect.mEffectID)
+                  << " (" << effect.mEffectID << ")" << std::endl;
+        if (effect.mSkill != -1)
+            std::cout << "    Skill: " << skillLabel(effect.mSkill)
+                      << " (" << (int)effect.mSkill << ")" << std::endl;
+        if (effect.mAttribute != -1)
+            std::cout << "    Attribute: " << attributeLabel(effect.mAttribute)
+                      << " (" << (int)effect.mAttribute << ")" << std::endl;
+        std::cout << "    Range: " << rangeTypeLabel(effect.mRange)
+                  << " (" << effect.mRange << ")" << std::endl;
         // Area is always zero if range type is "Self"
-        if (eit->mRange != ESM::RT_Self)
-            std::cout << "    Area: " << eit->mArea << std::endl;
-        std::cout << "    Duration: " << eit->mDuration << std::endl;
-        std::cout << "    Magnitude: " << eit->mMagnMin << "-" << eit->mMagnMax << std::endl;
+        if (effect.mRange != ESM::RT_Self)
+            std::cout << "    Area: " << effect.mArea << std::endl;
+        std::cout << "    Duration: " << effect.mDuration << std::endl;
+        std::cout << "    Magnitude: " << effect.mMagnMin << "-" << effect.mMagnMax << std::endl;
         i++;
     }
 }
 
 void printTransport(const std::vector<ESM::Transport::Dest>& transport)
 {
-    std::vector<ESM::Transport::Dest>::const_iterator dit;
-    for (dit = transport.begin(); dit != transport.end(); ++dit)
+    for (const ESM::Transport::Dest& dest : transport)
     {
         std::cout << "  Destination Position: "
-                  << boost::format("%12.3f") % dit->mPos.pos[0] << ","
-                  << boost::format("%12.3f") % dit->mPos.pos[1] << ","
-                  << boost::format("%12.3f") % dit->mPos.pos[2] << ")" << std::endl;
+                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[0]) << ","
+                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[1]) << ","
+                  << Misc::StringUtils::format("%12.3f", dest.mPos.pos[2]) << ")" << std::endl;
         std::cout << "  Destination Rotation: "
-                  << boost::format("%9.6f") % dit->mPos.rot[0] << ","
-                  << boost::format("%9.6f") % dit->mPos.rot[1] << ","
-                  << boost::format("%9.6f") % dit->mPos.rot[2] << ")" << std::endl;
-        if (dit->mCellName != "")
-            std::cout << "  Destination Cell: " << dit->mCellName << std::endl;
+                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[0]) << ","
+                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[1]) << ","
+                  << Misc::StringUtils::format("%9.6f", dest.mPos.rot[2]) << ")" << std::endl;
+        if (!dest.mCellName.empty())
+            std::cout << "  Destination Cell: " << dest.mCellName << std::endl;
     }
 }
 
@@ -175,9 +172,9 @@ void printTransport(const std::vector<ESM::Transport::Dest>& transport)
 namespace EsmTool {
 
 RecordBase *
-RecordBase::create(ESM::NAME type)
+RecordBase::create(const ESM::NAME type)
 {
-    RecordBase *record = 0;
+    RecordBase *record = nullptr;
 
     switch (type.intval) {
     case ESM::REC_ACTI:
@@ -391,7 +388,7 @@ RecordBase::create(ESM::NAME type)
         break;
     }
     default:
-        record = 0;
+        record = nullptr;
     }
     if (record) {
         record->mType = type;
@@ -414,7 +411,7 @@ void Record<ESM::Potion>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -429,9 +426,9 @@ void Record<ESM::Armor>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
-    if (mData.mEnchant != "")
+    if (!mData.mEnchant.empty())
         std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
     std::cout << "  Type: " << armorTypeLabel(mData.mData.mType)
               << " (" << mData.mData.mType << ")" << std::endl;
@@ -440,15 +437,15 @@ void Record<ESM::Armor>::print()
     std::cout << "  Health: " << mData.mData.mHealth << std::endl;
     std::cout << "  Armor: " << mData.mData.mArmor << std::endl;
     std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    std::vector<ESM::PartReference>::iterator pit;
-    for (pit = mData.mParts.mParts.begin(); pit != mData.mParts.mParts.end(); ++pit)
+    for (const ESM::PartReference &part : mData.mParts.mParts)
     {
-        std::cout << "  Body Part: " << bodyPartLabel(pit->mPart)
-                  << " (" << (int)(pit->mPart) << ")" << std::endl;
-        std::cout << "    Male Name: " << pit->mMale << std::endl;
-        if (pit->mFemale != "")
-            std::cout << "    Female Name: " << pit->mFemale << std::endl;
+        std::cout << "  Body Part: " << bodyPartLabel(part.mPart)
+                  << " (" << (int)(part.mPart) << ")" << std::endl;
+        std::cout << "    Male Name: " << part.mMale << std::endl;
+        if (!part.mFemale.empty())
+            std::cout << "    Female Name: " << part.mFemale << std::endl;
     }
+
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -487,9 +484,9 @@ void Record<ESM::Book>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
-    if (mData.mEnchant != "")
+    if (!mData.mEnchant.empty())
         std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -516,9 +513,8 @@ void Record<ESM::BirthSign>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Texture: " << mData.mTexture << std::endl;
     std::cout << "  Description: " << mData.mDescription << std::endl;
-    std::vector<std::string>::iterator pit;
-    for (pit = mData.mPowers.mList.begin(); pit != mData.mPowers.mList.end(); ++pit)
-        std::cout << "  Power: " << *pit << std::endl;
+    for (const std::string &power : mData.mPowers.mList)
+        std::cout << "  Power: " << power << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -526,9 +522,9 @@ template<>
 void Record<ESM::Cell>::print()
 {
     // None of the cells have names...
-    if (mData.mName != "")
+    if (!mData.mName.empty())
         std::cout << "  Name: " << mData.mName << std::endl;
-    if (mData.mRegion != "")
+    if (!mData.mRegion.empty())
         std::cout << "  Region: " << mData.mRegion << std::endl;
     std::cout << "  Flags: " << cellFlags(mData.mData.mFlags) << std::endl;
 
@@ -538,14 +534,22 @@ void Record<ESM::Cell>::print()
     if (mData.mData.mFlags & ESM::Cell::Interior &&
         !(mData.mData.mFlags & ESM::Cell::QuasiEx))
     {
-        std::cout << "  Ambient Light Color: " << mData.mAmbi.mAmbient << std::endl;
-        std::cout << "  Sunlight Color: " << mData.mAmbi.mSunlight << std::endl;
-        std::cout << "  Fog Color: " << mData.mAmbi.mFog << std::endl;
-        std::cout << "  Fog Density: " << mData.mAmbi.mFogDensity << std::endl;
+        if (mData.hasAmbient())
+        {
+            // TODO: see if we can change the integer representation to something more sensible
+            std::cout << "  Ambient Light Color: " << mData.mAmbi.mAmbient << std::endl;
+            std::cout << "  Sunlight Color: " << mData.mAmbi.mSunlight << std::endl;
+            std::cout << "  Fog Color: " << mData.mAmbi.mFog << std::endl;
+            std::cout << "  Fog Density: " << mData.mAmbi.mFogDensity << std::endl;
+        }
+        else
+        {
+            std::cout << "  No Ambient Information" << std::endl;
+        }
         std::cout << "  Water Level: " << mData.mWater << std::endl;
     }
     else
-        std::cout << "  Map Color: " << boost::format("0x%08X") % mData.mMapColor << std::endl;
+        std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
     std::cout << "  Water Level Int: " << mData.mWaterInt << std::endl;
     std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
@@ -580,23 +584,22 @@ void Record<ESM::Clothing>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
-    if (mData.mEnchant != "")
+    if (!mData.mEnchant.empty())
         std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
     std::cout << "  Type: " << clothingTypeLabel(mData.mData.mType)
               << " (" << mData.mData.mType << ")" << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
     std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
-    std::vector<ESM::PartReference>::iterator pit;
-    for (pit = mData.mParts.mParts.begin(); pit != mData.mParts.mParts.end(); ++pit)
+    for (const ESM::PartReference &part : mData.mParts.mParts)
     {
-        std::cout << "  Body Part: " << bodyPartLabel(pit->mPart)
-                  << " (" << (int)(pit->mPart) << ")" << std::endl;
-        std::cout << "    Male Name: " << pit->mMale << std::endl;
-        if (pit->mFemale != "")
-            std::cout << "    Female Name: " << pit->mFemale << std::endl;
+        std::cout << "  Body Part: " << bodyPartLabel(part.mPart)
+                  << " (" << (int)(part.mPart) << ")" << std::endl;
+        std::cout << "    Male Name: " << part.mMale << std::endl;
+        if (!part.mFemale.empty())
+            std::cout << "    Female Name: " << part.mFemale << std::endl;
     }
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
@@ -606,14 +609,13 @@ void Record<ESM::Container>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Flags: " << containerFlags(mData.mFlags) << std::endl;
     std::cout << "  Weight: " << mData.mWeight << std::endl;
-    std::vector<ESM::ContItem>::iterator cit;
-    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); ++cit)
-        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount
-                  << " Item: " << cit->mItem.toString() << std::endl;
+    for (const ESM::ContItem &item : mData.mInventory.mList)
+        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                  << " Item: " << item.mItem << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -623,7 +625,8 @@ void Record<ESM::Creature>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Script: " << mData.mScript << std::endl;
-    std::cout << "  Flags: " << creatureFlags(mData.mFlags) << std::endl;
+    std::cout << "  Flags: " << creatureFlags((int)mData.mFlags) << std::endl;
+    std::cout << "  Blood Type: " << mData.mBloodType+1 << std::endl;
     std::cout << "  Original: " << mData.mOriginal << std::endl;
     std::cout << "  Scale: " << mData.mScale << std::endl;
 
@@ -656,18 +659,16 @@ void Record<ESM::Creature>::print()
               << "-" <<  mData.mData.mAttack[5] << std::endl;
     std::cout << "  Gold: " << mData.mData.mGold << std::endl;
 
-    std::vector<ESM::ContItem>::iterator cit;
-    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); ++cit)
-        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount
-                  << " Item: " << cit->mItem.toString() << std::endl;
+    for (const ESM::ContItem &item : mData.mInventory.mList)
+        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                  << " Item: " << item.mItem << std::endl;
 
-    std::vector<std::string>::iterator sit;
-    for (sit = mData.mSpells.mList.begin(); sit != mData.mSpells.mList.end(); ++sit)
-        std::cout << "  Spell: " << *sit << std::endl;
+    for (const std::string &spell : mData.mSpells.mList)
+        std::cout << "  Spell: " << spell << std::endl;
 
     printTransport(mData.getTransport());
 
-    std::cout << "  Artifical Intelligence: " << mData.mHasAI << std::endl;
+    std::cout << "  Artificial Intelligence: " << std::endl;
     std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
     std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
     std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
@@ -675,12 +676,10 @@ void Record<ESM::Creature>::print()
     std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
     std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
     std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
-    std::cout << "    AI U4:" << (int)mData.mAiData.mU4 << std::endl;
-    std::cout << "    AI Services:" << boost::format("0x%08X") % mData.mAiData.mServices << std::endl;
+    std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
 
-    std::vector<ESM::AIPackage>::iterator pit;
-    for (pit = mData.mAiPackage.mList.begin(); pit != mData.mAiPackage.mList.end(); ++pit)
-        printAIPackage(*pit);
+    for (const ESM::AIPackage &package : mData.mAiPackage.mList)
+        printAIPackage(package);
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -693,9 +692,8 @@ void Record<ESM::Dialogue>::print()
     // Sadly, there are no DialInfos, because the loader dumps as it
     // loads, rather than loading and then dumping. :-( Anyone mind if
     // I change this?
-    ESM::Dialogue::InfoContainer::iterator iit;
-    for (iit = mData.mInfo.begin(); iit != mData.mInfo.end(); ++iit)
-        std::cout << "INFO!" << iit->mId << std::endl;
+    for (const ESM::DialInfo &info : mData.mInfo)
+        std::cout << "INFO!" << info.mId << std::endl;
 }
 
 template<>
@@ -716,7 +714,7 @@ void Record<ESM::Enchantment>::print()
               << " (" << mData.mData.mType << ")" << std::endl;
     std::cout << "  Cost: " << mData.mData.mCost << std::endl;
     std::cout << "  Charge: " << mData.mData.mCharge << std::endl;
-    std::cout << "  AutoCalc: " << mData.mData.mAutocalc << std::endl;
+    std::cout << "  Flags: " << enchantmentFlags(mData.mData.mFlags) << std::endl;
     printEffectList(mData.mEffects);
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
@@ -730,12 +728,11 @@ void Record<ESM::Faction>::print()
               << " (" << mData.mData.mAttribute[0] << ")" << std::endl;
     std::cout << "  Attribute2: " << attributeLabel(mData.mData.mAttribute[1])
               << " (" << mData.mData.mAttribute[1] << ")" << std::endl;
-    for (int i = 0; i < 7; i++)
-        if (mData.mData.mSkills[i] != -1)
-            std::cout << "  Skill: " << skillLabel(mData.mData.mSkills[i])
-                      << " (" << mData.mData.mSkills[i] << ")" << std::endl;
+    for (int skill : mData.mData.mSkills)
+        if (skill != -1)
+            std::cout << "  Skill: " << skillLabel(skill) << " (" << skill << ")" << std::endl;
     for (int i = 0; i != 10; i++)
-        if (mData.mRanks[i] != "")
+        if (!mData.mRanks[i].empty())
         {
             std::cout << "  Rank: " << mData.mRanks[i] << std::endl;
             std::cout << "    Attribute1 Requirement: "
@@ -743,15 +740,14 @@ void Record<ESM::Faction>::print()
             std::cout << "    Attribute2 Requirement: "
                       << mData.mData.mRankData[i].mAttribute2 << std::endl;
             std::cout << "    One Skill at Level: "
-                      << mData.mData.mRankData[i].mSkill1 << std::endl;
+                      << mData.mData.mRankData[i].mPrimarySkill << std::endl;
             std::cout << "    Two Skills at Level: "
-                      << mData.mData.mRankData[i].mSkill2 << std::endl;
+                      << mData.mData.mRankData[i].mFavouredSkill << std::endl;
             std::cout << "    Faction Reaction: "
                       << mData.mData.mRankData[i].mFactReaction << std::endl;
         }
-    std::map<std::string, int>::iterator rit;
-    for (rit = mData.mReactions.begin(); rit != mData.mReactions.end(); ++rit)
-        std::cout << "  Reaction: " << rit->second << " = " << rit->first << std::endl;
+    for (const auto &reaction : mData.mReactions)
+        std::cout << "  Reaction: " << reaction.second << " = " << reaction.first << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -772,34 +768,34 @@ template<>
 void Record<ESM::DialInfo>::print()
 {
     std::cout << "  Id: " << mData.mId << std::endl;
-    if (mData.mPrev != "")
+    if (!mData.mPrev.empty())
         std::cout << "  Previous ID: " << mData.mPrev << std::endl;
-    if (mData.mNext != "")
+    if (!mData.mNext.empty())
         std::cout << "  Next ID: " << mData.mNext << std::endl;
     std::cout << "  Text: " << mData.mResponse << std::endl;
-    if (mData.mActor != "")
+    if (!mData.mActor.empty())
         std::cout << "  Actor: " << mData.mActor << std::endl;
-    if (mData.mRace != "")
+    if (!mData.mRace.empty())
         std::cout << "  Race: " << mData.mRace << std::endl;
-    if (mData.mClass != "")
+    if (!mData.mClass.empty())
         std::cout << "  Class: " << mData.mClass << std::endl;
     std::cout << "  Factionless: " << mData.mFactionLess << std::endl;
-    if (mData.mFaction != "")
+    if (!mData.mFaction.empty())
         std::cout << "  NPC Faction: " << mData.mFaction << std::endl;
     if (mData.mData.mRank != -1)
         std::cout << "  NPC Rank: " << (int)mData.mData.mRank << std::endl;
-    if (mData.mPcFaction != "")
+    if (!mData.mPcFaction.empty())
         std::cout << "  PC Faction: " << mData.mPcFaction << std::endl;
     // CHANGE? non-standard capitalization mPCrank -> mPCRank (mPcRank?)
     if (mData.mData.mPCrank != -1)
         std::cout << "  PC Rank: " << (int)mData.mData.mPCrank << std::endl;
-    if (mData.mCell != "")
+    if (!mData.mCell.empty())
         std::cout << "  Cell: " << mData.mCell << std::endl;
     if (mData.mData.mDisposition > 0)
         std::cout << "  Disposition/Journal index: " << mData.mData.mDisposition << std::endl;
     if (mData.mData.mGender != ESM::DialInfo::NA)
         std::cout << "  Gender: " << mData.mData.mGender << std::endl;
-    if (mData.mSound != "")
+    if (!mData.mSound.empty())
         std::cout << "  Sound File: " << mData.mSound << std::endl;
 
 
@@ -808,11 +804,10 @@ void Record<ESM::DialInfo>::print()
     std::cout << "  Unknown1: " << mData.mData.mUnknown1 << std::endl;
     std::cout << "  Unknown2: " << (int)mData.mData.mUnknown2 << std::endl;
 
-    std::vector<ESM::DialInfo::SelectStruct>::iterator sit;
-    for (sit = mData.mSelects.begin(); sit != mData.mSelects.end(); ++sit)
-        std::cout << "  Select Rule: " << ruleString(*sit) << std::endl;
+    for (const ESM::DialInfo::SelectStruct &rule : mData.mSelects)
+        std::cout << "  Select Rule: " << ruleString(rule) << std::endl;
 
-    if (mData.mResultScript != "")
+    if (!mData.mResultScript.empty())
     {
         if (mPrintPlain)
         {
@@ -835,7 +830,7 @@ void Record<ESM::Ingredient>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -877,10 +872,9 @@ void Record<ESM::CreatureLevList>::print()
     std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
     std::cout << "  Flags: " << creatureListFlags(mData.mFlags) << std::endl;
     std::cout << "  Number of items: " << mData.mList.size() << std::endl;
-    std::vector<ESM::LevelledListBase::LevelItem>::iterator iit;
-    for (iit = mData.mList.begin(); iit != mData.mList.end(); ++iit)
-        std::cout << "  Creature: Level: " << iit->mLevel
-                  << " Creature: " << iit->mId << std::endl;
+    for (const ESM::LevelledListBase::LevelItem &item : mData.mList)
+        std::cout << "  Creature: Level: " << item.mLevel
+                  << " Creature: " << item.mId << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
@@ -890,23 +884,22 @@ void Record<ESM::ItemLevList>::print()
     std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
     std::cout << "  Flags: " << itemListFlags(mData.mFlags) << std::endl;
     std::cout << "  Number of items: " << mData.mList.size() << std::endl;
-    std::vector<ESM::LevelledListBase::LevelItem>::iterator iit;
-    for (iit = mData.mList.begin(); iit != mData.mList.end(); ++iit)
-        std::cout << "  Inventory: Level: " << iit->mLevel
-                  << " Item: " << iit->mId << std::endl;
+    for (const ESM::LevelledListBase::LevelItem &item : mData.mList)
+        std::cout << "  Inventory: Level: " << item.mLevel
+                  << " Item: " << item.mId << std::endl;
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
 
 template<>
 void Record<ESM::Light>::print()
 {
-    if (mData.mName != "")
+    if (!mData.mName.empty())
         std::cout << "  Name: " << mData.mName << std::endl;
-    if (mData.mModel != "")
+    if (!mData.mModel.empty())
         std::cout << "  Model: " << mData.mModel << std::endl;
-    if (mData.mIcon != "")
+    if (!mData.mIcon.empty())
         std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Flags: " << lightFlags(mData.mData.mFlags) << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
@@ -924,7 +917,7 @@ void Record<ESM::Lockpick>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -939,7 +932,7 @@ void Record<ESM::Probe>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -954,7 +947,7 @@ void Record<ESM::Repair>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -981,21 +974,21 @@ void Record<ESM::MagicEffect>::print()
     std::cout << "  Icon: " << mData.mIcon << std::endl;
     std::cout << "  Flags: " << magicEffectFlags(mData.mData.mFlags) << std::endl;
     std::cout << "  Particle Texture: " << mData.mParticle << std::endl;
-    if (mData.mCasting != "")
+    if (!mData.mCasting.empty())
         std::cout << "  Casting Static: " << mData.mCasting << std::endl;
-    if (mData.mCastSound != "")
+    if (!mData.mCastSound.empty())
         std::cout << "  Casting Sound: " << mData.mCastSound << std::endl;
-    if (mData.mBolt != "")
+    if (!mData.mBolt.empty())
         std::cout << "  Bolt Static: " << mData.mBolt << std::endl;
-    if (mData.mBoltSound != "")
+    if (!mData.mBoltSound.empty())
         std::cout << "  Bolt Sound: " << mData.mBoltSound << std::endl;
-    if (mData.mHit != "")
+    if (!mData.mHit.empty())
         std::cout << "  Hit Static: " << mData.mHit << std::endl;
-    if (mData.mHitSound != "")
+    if (!mData.mHitSound.empty())
         std::cout << "  Hit Sound: " << mData.mHitSound << std::endl;
-    if (mData.mArea != "")
+    if (!mData.mArea.empty())
         std::cout << "  Area Static: " << mData.mArea << std::endl;
-    if (mData.mAreaSound != "")
+    if (!mData.mAreaSound.empty())
         std::cout << "  Area Sound: " << mData.mAreaSound << std::endl;
     std::cout << "  School: " << schoolLabel(mData.mData.mSchool)
               << " (" << mData.mData.mSchool << ")" << std::endl;
@@ -1015,7 +1008,7 @@ void Record<ESM::Miscellaneous>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
@@ -1032,11 +1025,13 @@ void Record<ESM::NPC>::print()
     std::cout << "  Head Model: " << mData.mHead << std::endl;
     std::cout << "  Race: " << mData.mRace << std::endl;
     std::cout << "  Class: " << mData.mClass << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
-    if (mData.mFaction != "")
+    if (!mData.mFaction.empty())
         std::cout << "  Faction: " << mData.mFaction << std::endl;
-    std::cout << "  Flags: " << npcFlags(mData.mFlags) << std::endl;
+    std::cout << "  Flags: " << npcFlags((int)mData.mFlags) << std::endl;
+    if (mData.mBloodType != 0)
+        std::cout << "  Blood Type: " << mData.mBloodType+1 << std::endl;
 
     if (mData.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
     {
@@ -1044,14 +1039,6 @@ void Record<ESM::NPC>::print()
         std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
         std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
         std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
-        //Why do we want to print these fields? They are padding in the struct and contain
-        // nothing of real value. Now we don't deal with NPDTstruct12 in runtime either...
-        //std::cout << "  Unknown1: "
-        //          << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown1) << std::endl;
-        //std::cout << "  Unknown2: "
-        //          << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown2) << std::endl;
-        //std::cout << "  Unknown3: "
-        //          << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown3) << std::endl;
         std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
     }
     else {
@@ -1059,7 +1046,6 @@ void Record<ESM::NPC>::print()
         std::cout << "  Reputation: " << (int)mData.mNpdt.mReputation << std::endl;
         std::cout << "  Disposition: " << (int)mData.mNpdt.mDisposition << std::endl;
         std::cout << "  Rank: " << (int)mData.mNpdt.mRank << std::endl;
-        std::cout << "  FactionID: " << (int)mData.mNpdt.mFactionID << std::endl;
 
         std::cout << "  Attributes:" << std::endl;
         std::cout << "    Strength: " << (int)mData.mNpdt.mStrength << std::endl;
@@ -1079,22 +1065,19 @@ void Record<ESM::NPC>::print()
         std::cout << "  Health: " << mData.mNpdt.mHealth << std::endl;
         std::cout << "  Magicka: " << mData.mNpdt.mMana << std::endl;
         std::cout << "  Fatigue: " << mData.mNpdt.mFatigue << std::endl;
-        std::cout << "  Unknown: " << (int)mData.mNpdt.mUnknown << std::endl;
         std::cout << "  Gold: " << mData.mNpdt.mGold << std::endl;
     }
 
-    std::vector<ESM::ContItem>::iterator cit;
-    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); ++cit)
-        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount
-                  << " Item: " << cit->mItem.toString() << std::endl;
+    for (const ESM::ContItem &item : mData.mInventory.mList)
+        std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                  << " Item: " << item.mItem << std::endl;
 
-    std::vector<std::string>::iterator sit;
-    for (sit = mData.mSpells.mList.begin(); sit != mData.mSpells.mList.end(); ++sit)
-        std::cout << "  Spell: " << *sit << std::endl;
+    for (const std::string &spell : mData.mSpells.mList)
+        std::cout << "  Spell: " << spell << std::endl;
 
     printTransport(mData.getTransport());
 
-    std::cout << "  Artifical Intelligence: " << mData.mHasAI << std::endl;
+    std::cout << "  Artificial Intelligence: " << std::endl;
     std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
     std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
     std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
@@ -1102,12 +1085,10 @@ void Record<ESM::NPC>::print()
     std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
     std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
     std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
-    std::cout << "    AI U4:" << (int)mData.mAiData.mU4 << std::endl;
-    std::cout << "    AI Services:" << boost::format("0x%08X") % mData.mAiData.mServices << std::endl;
+    std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
 
-    std::vector<ESM::AIPackage>::iterator pit;
-    for (pit = mData.mAiPackage.mList.begin(); pit != mData.mAiPackage.mList.end(); ++pit)
-        printAIPackage(*pit);
+    for (const ESM::AIPackage &package : mData.mAiPackage.mList)
+        printAIPackage(package);
 
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
@@ -1124,23 +1105,22 @@ void Record<ESM::Pathgrid>::print()
     std::cout << "  Edge Count: " << mData.mEdges.size() << std::endl;
 
     int i = 0;
-    ESM::Pathgrid::PointList::iterator pit;
-    for (pit = mData.mPoints.begin(); pit != mData.mPoints.end(); ++pit)
+    for (const ESM::Pathgrid::Point &point : mData.mPoints)
     {
         std::cout << "  Point[" << i << "]:" << std::endl;
-        std::cout << "    Coordinates: (" << pit->mX << ","
-             << pit->mY << "," << pit->mZ << ")" << std::endl;
-        std::cout << "    Auto-Generated: " << (int)pit->mAutogenerated << std::endl;
-        std::cout << "    Connections: " << (int)pit->mConnectionNum << std::endl;
-        std::cout << "    Unknown: " << pit->mUnknown << std::endl;
+        std::cout << "    Coordinates: (" << point.mX << ","
+             << point.mY << "," << point.mZ << ")" << std::endl;
+        std::cout << "    Auto-Generated: " << (int)point.mAutogenerated << std::endl;
+        std::cout << "    Connections: " << (int)point.mConnectionNum << std::endl;
+        std::cout << "    Unknown: " << point.mUnknown << std::endl;
         i++;
     }
+
     i = 0;
-    ESM::Pathgrid::EdgeList::iterator eit;
-    for (eit = mData.mEdges.begin(); eit != mData.mEdges.end(); ++eit)
+    for (const ESM::Pathgrid::Edge &edge : mData.mEdges)
     {
-        std::cout << "  Edge[" << i << "]: " << eit->mV0 << " -> " << eit->mV1 << std::endl;
-        if (eit->mV0 >= mData.mData.mS2 || eit->mV1 >= mData.mData.mS2)
+        std::cout << "  Edge[" << i << "]: " << edge.mV0 << " -> " << edge.mV1 << std::endl;
+        if (edge.mV0 >= mData.mData.mS2 || edge.mV1 >= mData.mData.mS2)
             std::cout << "  BAD POINT IN EDGE!" << std::endl;
         i++;
     }
@@ -1183,9 +1163,8 @@ void Record<ESM::Race>::print()
                       << " (" << mData.mData.mBonus[i].mSkill << ") = "
                       << mData.mData.mBonus[i].mBonus << std::endl;
 
-    std::vector<std::string>::iterator sit;
-    for (sit = mData.mPowers.mList.begin(); sit != mData.mPowers.mList.end(); ++sit)
-        std::cout << "  Power: " << *sit << std::endl;
+    for (const std::string &power : mData.mPowers.mList)
+        std::cout << "  Power: " << power << std::endl;
 
     std::cout << "  Deleted: " << mIsDeleted << std::endl;
 }
@@ -1207,11 +1186,10 @@ void Record<ESM::Region>::print()
     std::cout << "    UnknownA: " << (int)mData.mData.mA << std::endl;
     std::cout << "    UnknownB: " << (int)mData.mData.mB << std::endl;
     std::cout << "  Map Color: " << mData.mMapColor << std::endl;
-    if (mData.mSleepList != "")
+    if (!mData.mSleepList.empty())
         std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
-    std::vector<ESM::Region::SoundRef>::iterator sit;
-    for (sit = mData.mSoundList.begin(); sit != mData.mSoundList.end(); ++sit)
-        std::cout << "  Sound: " << (int)sit->mChance << " = " << sit->mSound.toString() << std::endl;
+    for (const ESM::Region::SoundRef &soundref : mData.mSoundList)
+        std::cout << "  Sound: " << (int)soundref.mChance << " = " << soundref.mSound << std::endl;
 }
 
 template<>
@@ -1225,15 +1203,12 @@ void Record<ESM::Script>::print()
     std::cout << "  Script Data Size: " << mData.mData.mScriptDataSize << std::endl;
     std::cout << "  Table Size: " << mData.mData.mStringTableSize << std::endl;
 
-
-    std::vector<std::string>::iterator vit;
-    for (vit = mData.mVarNames.begin(); vit != mData.mVarNames.end(); ++vit)
-        std::cout << "  Variable: " << *vit << std::endl;
+    for (const std::string &variable : mData.mVarNames)
+        std::cout << "  Variable: " << variable << std::endl;
 
     std::cout << "  ByteCode: ";
-    std::vector<unsigned char>::iterator cit;
-    for (cit = mData.mScriptData.begin(); cit != mData.mScriptData.end(); ++cit)
-        std::cout << boost::format("%02X") % (int)(*cit);
+    for (const unsigned char &byte : mData.mScriptData)
+        std::cout << Misc::StringUtils::format("%02X", (int)(byte));
     std::cout << std::endl;
 
     if (mPrintPlain)
@@ -1268,7 +1243,8 @@ void Record<ESM::Skill>::print()
 template<>
 void Record<ESM::SoundGenerator>::print()
 {
-    std::cout << "  Creature: " << mData.mCreature << std::endl;
+    if (!mData.mCreature.empty())
+        std::cout << "  Creature: " << mData.mCreature << std::endl;
     std::cout << "  Sound: " << mData.mSound << std::endl;
     std::cout << "  Type: " << soundTypeLabel(mData.mType)
               << " (" << mData.mType << ")" << std::endl;
@@ -1316,15 +1292,15 @@ template<>
 void Record<ESM::Weapon>::print()
 {
     // No names on VFX bolts
-    if (mData.mName != "")
+    if (!mData.mName.empty())
         std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     // No icons on VFX bolts or magic bolts
-    if (mData.mIcon != "")
+    if (!mData.mIcon.empty())
         std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mScript != "")
+    if (!mData.mScript.empty())
         std::cout << "  Script: " << mData.mScript << std::endl;
-    if (mData.mEnchant != "")
+    if (!mData.mEnchant.empty())
         std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
     std::cout << "  Type: " << weaponTypeLabel(mData.mData.mType)
               << " (" << mData.mData.mType << ")" << std::endl;
@@ -1356,25 +1332,25 @@ std::string Record<ESM::Cell>::getId() const
 template<> 
 std::string Record<ESM::Land>::getId() const
 {
-    return ""; // No ID for Land record
+    return std::string(); // No ID for Land record
 }
 
 template<> 
 std::string Record<ESM::MagicEffect>::getId() const
 {
-    return ""; // No ID for MagicEffect record
+    return std::string(); // No ID for MagicEffect record
 }
 
 template<> 
 std::string Record<ESM::Pathgrid>::getId() const
 {
-    return ""; // No ID for Pathgrid record
+    return std::string(); // No ID for Pathgrid record
 }
 
 template<> 
 std::string Record<ESM::Skill>::getId() const
 {
-    return ""; // No ID for Skill record
+    return std::string(); // No ID for Skill record
 }
 
 } // end namespace

apps/esmtool/record.hpp

@@ -74,7 +74,7 @@ namespace EsmTool
             : mIsDeleted(false)
         {}
 
-        std::string getId() const {
+        std::string getId() const override {
             return mData.mId;
         }
 
@@ -82,15 +82,15 @@ namespace EsmTool
             return mData;
         }
 
-        void save(ESM::ESMWriter &esm) {
+        void save(ESM::ESMWriter &esm) override {
             mData.save(esm, mIsDeleted);
         }
 
-        void load(ESM::ESMReader &esm) {
+        void load(ESM::ESMReader &esm) override {
             mData.load(esm, mIsDeleted);
         }
 
-        void print();
+        void print() override;
     };
     
     template<> std::string Record<ESM::Cell>::getId() const;

apps/essimporter/converter.cpp

@@ -8,6 +8,8 @@
 #include <components/esm/creaturestate.hpp>
 #include <components/esm/containerstate.hpp>
 
+#include <components/misc/constants.hpp>
+
 #include "convertcrec.hpp"
 #include "convertcntc.hpp"
 #include "convertscri.hpp"
@@ -50,9 +52,7 @@ namespace
                           // a dynamically created record e.g. player-enchanted weapon
 
         std::string index = indexedRefId.substr(indexedRefId.size()-8);
-        if(index.find_first_not_of("0123456789ABCDEF") == std::string::npos )
-            return true;
-        return false;
+        return index.find_first_not_of("0123456789ABCDEF") == std::string::npos;
     }
 
     void splitIndexedRefId(const std::string& indexedRefId, int& refIndex, std::string& refId)
@@ -137,12 +137,12 @@ namespace ESSImport
         image2->allocateImage(width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE);
         memcpy(image2->data(), &data[0], data.size());
 
-        for (std::set<std::pair<int, int> >::const_iterator it = mContext->mExploredCells.begin(); it != mContext->mExploredCells.end(); ++it)
+        for (const auto & exploredCell : mContext->mExploredCells)
         {
-            if (it->first > mContext->mGlobalMapState.mBounds.mMaxX
-                    || it->first < mContext->mGlobalMapState.mBounds.mMinX
-                    || it->second > mContext->mGlobalMapState.mBounds.mMaxY
-                    || it->second < mContext->mGlobalMapState.mBounds.mMinY)
+            if (exploredCell.first > mContext->mGlobalMapState.mBounds.mMaxX
+                    || exploredCell.first < mContext->mGlobalMapState.mBounds.mMinX
+                    || exploredCell.second > mContext->mGlobalMapState.mBounds.mMaxY
+                    || exploredCell.second < mContext->mGlobalMapState.mBounds.mMinY)
             {
                 // out of bounds, I think this could happen, since the original engine had a fixed-size map
                 continue;
@@ -150,12 +150,12 @@ namespace ESSImport
 
             int imageLeftSrc = mGlobalMapImage->s()/2;
             int imageTopSrc = mGlobalMapImage->t()/2;
-            imageLeftSrc += it->first * cellSize;
-            imageTopSrc -= it->second * cellSize;
+            imageLeftSrc += exploredCell.first * cellSize;
+            imageTopSrc -= exploredCell.second * cellSize;
             int imageLeftDst = width/2;
             int imageTopDst = height/2;
-            imageLeftDst += it->first * cellSize;
-            imageTopDst -= it->second * cellSize;
+            imageLeftDst += exploredCell.first * cellSize;
+            imageTopDst -= exploredCell.second * cellSize;
             for (int x=0; x<cellSize; ++x)
                 for (int y=0; y<cellSize; ++y)
                 {
@@ -288,12 +288,12 @@ namespace ESSImport
             notepos[1] += 31.f;
             notepos[0] += 0.5;
             notepos[1] += 0.5;
-            notepos[0] = 8192 * notepos[0] / 32.f;
-            notepos[1] = 8192 * notepos[1] / 32.f;
+            notepos[0] = Constants::CellSizeInUnits * notepos[0] / 32.f;
+            notepos[1] = Constants::CellSizeInUnits * notepos[1] / 32.f;
             if (cell.isExterior())
             {
-                notepos[0] += 8192 * cell.mData.mX;
-                notepos[1] += 8192 * cell.mData.mY;
+                notepos[0] += Constants::CellSizeInUnits * cell.mData.mX;
+                notepos[1] += Constants::CellSizeInUnits * cell.mData.mY;
             }
             // TODO: what encoding is this in?
             std::string note = esm.getHNString("MPNT");
@@ -327,9 +327,8 @@ namespace ESSImport
         csta.mWaterLevel = esmcell.mWater;
         csta.save(esm);
 
-        for (std::vector<CellRef>::const_iterator refIt = cell.mRefs.begin(); refIt != cell.mRefs.end(); ++refIt)
+        for (const auto & cellref : cell.mRefs)
         {
-            const CellRef& cellref = *refIt;
             ESM::CellRef out (cellref);
 
             // TODO: use mContext->mCreatures/mNpcs
@@ -435,16 +434,16 @@ namespace ESSImport
 
     void ConvertCell::write(ESM::ESMWriter &esm)
     {
-        for (std::map<std::string, Cell>::const_iterator it = mIntCells.begin(); it != mIntCells.end(); ++it)
-            writeCell(it->second, esm);
+        for (const auto & cell : mIntCells)
+            writeCell(cell.second, esm);
 
-        for (std::map<std::pair<int, int>, Cell>::const_iterator it = mExtCells.begin(); it != mExtCells.end(); ++it)
-            writeCell(it->second, esm);
+        for (const auto & cell : mExtCells)
+            writeCell(cell.second, esm);
 
-        for (std::vector<ESM::CustomMarker>::const_iterator it = mMarkers.begin(); it != mMarkers.end(); ++it)
+        for (const auto & marker : mMarkers)
         {
             esm.startRecord(ESM::REC_MARK);
-            it->save(esm);
+            marker.save(esm);
             esm.endRecord(ESM::REC_MARK);
         }
     }

apps/essimporter/converter.hpp

@@ -79,9 +79,9 @@ template <typename T>
 class DefaultConverter : public Converter
 {
 public:
-    virtual int getStage() { return 0; }
+    int getStage() override { return 0; }
 
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         T record;
         bool isDeleted = false;
@@ -90,7 +90,7 @@ public:
         mRecords[record.mId] = record;
     }
 
-    virtual void write(ESM::ESMWriter& esm)
+    void write(ESM::ESMWriter& esm) override
     {
         for (typename std::map<std::string, T>::const_iterator it = mRecords.begin(); it != mRecords.end(); ++it)
         {
@@ -107,7 +107,7 @@ protected:
 class ConvertNPC : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         ESM::NPC npc;
         bool isDeleted = false;
@@ -127,8 +127,8 @@ public:
             ESM::SpellState::SpellParams empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
-            for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
-                mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells[*it] = empty;
+            for (const auto & spell : npc.mSpells.mList)
+                mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells[spell] = empty;
 
             // Clear the list now that we've written it, this prevents issues cropping up with
             // ensureCustomData() in OpenMW tripping over no longer existing spells, where an error would be fatal.
@@ -144,7 +144,7 @@ public:
 class ConvertCREA : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         // See comment in ConvertNPC
         ESM::Creature creature;
@@ -162,7 +162,7 @@ public:
 class ConvertGlobal : public DefaultConverter<ESM::Global>
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         ESM::Global global;
         bool isDeleted = false;
@@ -183,7 +183,7 @@ public:
 class ConvertClass : public DefaultConverter<ESM::Class>
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         ESM::Class class_;
         bool isDeleted = false;
@@ -199,7 +199,7 @@ public:
 class ConvertBook : public DefaultConverter<ESM::Book>
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         ESM::Book book;
         bool isDeleted = false;
@@ -215,7 +215,7 @@ public:
 class ConvertNPCC : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         std::string id = esm.getHNString("NAME");
         NPCC npcc;
@@ -235,7 +235,7 @@ public:
 class ConvertREFR : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         REFR refr;
         refr.load(esm);
@@ -261,7 +261,7 @@ public:
             }
         }
     }
-    virtual void write(ESM::ESMWriter& esm)
+    void write(ESM::ESMWriter& esm) override
     {
         esm.startRecord(ESM::REC_ASPL);
         esm.writeHNString("ID__", mSelectedSpell);
@@ -280,14 +280,14 @@ public:
           mLevitationEnabled(true)
     {}
 
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         PCDT pcdt;
         pcdt.load(esm);
 
         convertPCDT(pcdt, mContext->mPlayer, mContext->mDialogueState.mKnownTopics, mFirstPersonCam, mTeleportingEnabled, mLevitationEnabled, mContext->mControlsState);
     }
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
         esm.startRecord(ESM::REC_ENAB);
         esm.writeHNT("TELE", mTeleportingEnabled);
@@ -306,7 +306,7 @@ private:
 
 class ConvertCNTC : public Converter
 {
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         std::string id = esm.getHNString("NAME");
         CNTC cntc;
@@ -318,7 +318,7 @@ class ConvertCNTC : public Converter
 class ConvertCREC : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         std::string id = esm.getHNString("NAME");
         CREC crec;
@@ -330,8 +330,8 @@ public:
 class ConvertFMAP : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm);
-    virtual void write(ESM::ESMWriter &esm);
+    void read(ESM::ESMReader &esm) override;
+    void write(ESM::ESMWriter &esm) override;
 
 private:
     osg::ref_ptr<osg::Image> mGlobalMapImage;
@@ -340,8 +340,8 @@ private:
 class ConvertCell : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm);
-    virtual void write(ESM::ESMWriter& esm);
+    void read(ESM::ESMReader& esm) override;
+    void write(ESM::ESMWriter& esm) override;
 
 private:
     struct Cell
@@ -362,7 +362,7 @@ private:
 class ConvertKLST : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         KLST klst;
         klst.load(esm);
@@ -371,7 +371,7 @@ public:
         mContext->mPlayer.mObject.mNpcStats.mWerewolfKills = klst.mWerewolfKills;
     }
 
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
         esm.startRecord(ESM::REC_DCOU);
         for (std::map<std::string, int>::const_iterator it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
@@ -389,7 +389,7 @@ private:
 class ConvertFACT : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         ESM::Faction faction;
         bool isDeleted = false;
@@ -409,7 +409,7 @@ public:
 class ConvertSTLN : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         std::string itemid = esm.getHNString("NAME");
         Misc::StringUtils::lowerCaseInPlace(itemid);
@@ -428,15 +428,15 @@ public:
             }
         }
     }
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
         ESM::StolenItems items;
         for (std::map<std::string, std::set<Owner> >::const_iterator it = mStolenItems.begin(); it != mStolenItems.end(); ++it)
         {
             std::map<std::pair<std::string, bool>, int> owners;
-            for (std::set<Owner>::const_iterator ownerIt = it->second.begin(); ownerIt != it->second.end(); ++ownerIt)
+            for (const auto & ownerIt : it->second)
             {
-                owners.insert(std::make_pair(std::make_pair(ownerIt->first, ownerIt->second)
+                owners.insert(std::make_pair(std::make_pair(ownerIt.first, ownerIt.second)
                                              // Since OpenMW doesn't suffer from the owner contamination bug,
                                              // it needs a count argument. But for legacy savegames, we don't know
                                              // this count, so must assume all items of that ID are stolen,
@@ -467,7 +467,7 @@ private:
 class ConvertINFO : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         INFO info;
         info.load(esm);
@@ -477,7 +477,7 @@ public:
 class ConvertDIAL : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         std::string id = esm.getHNString("NAME");
         DIAL dial;
@@ -485,7 +485,7 @@ public:
         if (dial.mIndex > 0)
             mDials[id] = dial;
     }
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
         for (std::map<std::string, DIAL>::const_iterator it = mDials.begin(); it != mDials.end(); ++it)
         {
@@ -505,7 +505,7 @@ private:
 class ConvertQUES : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         std::string id = esm.getHNString("NAME");
         QUES quest;
@@ -516,7 +516,7 @@ public:
 class ConvertJOUR : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    void read(ESM::ESMReader& esm) override
     {
         JOUR journal;
         journal.load(esm);
@@ -526,9 +526,12 @@ public:
 class ConvertGAME : public Converter
 {
 public:
-    ConvertGAME() : mHasGame(false) {}
+    ConvertGAME()
+        : mHasGame(false)
+    {
+    }
 
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         mGame.load(esm);
         mHasGame = true;
@@ -548,7 +551,7 @@ public:
         }
     }
 
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
         if (!mHasGame)
             return;
@@ -575,7 +578,7 @@ private:
 class ConvertSCPT : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader &esm)
+    void read(ESM::ESMReader &esm) override
     {
         SCPT script;
         script.load(esm);
@@ -583,12 +586,12 @@ public:
         convertSCPT(script, out);
         mScripts.push_back(out);
     }
-    virtual void write(ESM::ESMWriter &esm)
+    void write(ESM::ESMWriter &esm) override
     {
-        for (std::vector<ESM::GlobalScript>::const_iterator it = mScripts.begin(); it != mScripts.end(); ++it)
+        for (const auto & script : mScripts)
         {
             esm.startRecord(ESM::REC_GSCR);
-            it->save(esm);
+            script.save(esm);
             esm.endRecord(ESM::REC_GSCR);
         }
     }
@@ -600,9 +603,9 @@ private:
 class ConvertPROJ : public Converter
 {
 public:
-    virtual int getStage() override { return 2; }
-    virtual void read(ESM::ESMReader& esm) override;
-    virtual void write(ESM::ESMWriter& esm) override;
+    int getStage() override { return 2; }
+    void read(ESM::ESMReader& esm) override;
+    void write(ESM::ESMWriter& esm) override;
 private:
     void convertBaseState(ESM::BaseProjectileState& base, const PROJ::PNAM& pnam);
     PROJ mProj;
@@ -611,8 +614,8 @@ private:
 class ConvertSPLM : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm) override;
-    virtual void write(ESM::ESMWriter& esm) override;
+    void read(ESM::ESMReader& esm) override;
+    void write(ESM::ESMWriter& esm) override;
 private:
     SPLM mSPLM;
 };

apps/essimporter/convertinventory.cpp

@@ -9,21 +9,20 @@ namespace ESSImport
     void convertInventory(const Inventory &inventory, ESM::InventoryState &state)
     {
         int index = 0;
-        for (std::vector<Inventory::InventoryItem>::const_iterator it = inventory.mItems.begin();
-             it != inventory.mItems.end(); ++it)
+        for (const auto & item : inventory.mItems)
         {
             ESM::ObjectState objstate;
             objstate.blank();
-            objstate.mRef = *it;
-            objstate.mRef.mRefID = Misc::StringUtils::lowerCase(it->mId);
-            objstate.mCount = std::abs(it->mCount); // restocking items have negative count in the savefile
+            objstate.mRef = item;
+            objstate.mRef.mRefID = Misc::StringUtils::lowerCase(item.mId);
+            objstate.mCount = std::abs(item.mCount); // restocking items have negative count in the savefile
                                                     // openmw handles them differently, so no need to set any flags
             state.mItems.push_back(objstate);
-            if (it->mRelativeEquipmentSlot != -1)
+            if (item.mRelativeEquipmentSlot != -1)
                 // Note we should really write the absolute slot here, which we do not know about
                 // Not a big deal, OpenMW will auto-correct to a valid slot, the only problem is when
                 // an item could be equipped in two different slots (e.g. equipped two rings)
-                state.mEquipmentSlots[index] = it->mRelativeEquipmentSlot;
+                state.mEquipmentSlots[index] = item.mRelativeEquipmentSlot;
             ++index;
         }
     }

apps/essimporter/convertplayer.cpp

@@ -1,5 +1,6 @@
 #include "convertplayer.hpp"
 
+#include <components/misc/constants.hpp>
 #include <components/misc/stringops.hpp>
 
 namespace ESSImport
@@ -9,13 +10,13 @@ namespace ESSImport
     {
         out.mBirthsign = pcdt.mBirthsign;
         out.mObject.mNpcStats.mBounty = pcdt.mBounty;
-        for (std::vector<PCDT::FNAM>::const_iterator it = pcdt.mFactions.begin(); it != pcdt.mFactions.end(); ++it)
+        for (const auto & essFaction : pcdt.mFactions)
         {
             ESM::NpcStats::Faction faction;
-            faction.mExpelled = (it->mFlags & 0x2) != 0;
-            faction.mRank = it->mRank;
-            faction.mReputation = it->mReputation;
-            out.mObject.mNpcStats.mFactions[Misc::StringUtils::lowerCase(it->mFactionName.toString())] = faction;
+            faction.mExpelled = (essFaction.mFlags & 0x2) != 0;
+            faction.mRank = essFaction.mRank;
+            faction.mReputation = essFaction.mReputation;
+            out.mObject.mNpcStats.mFactions[Misc::StringUtils::lowerCase(essFaction.mFactionName.toString())] = faction;
         }
         for (int i=0; i<3; ++i)
             out.mObject.mNpcStats.mSpecIncreases[i] = pcdt.mPNAM.mSpecIncreases[i];
@@ -34,10 +35,9 @@ namespace ESSImport
         teleportingEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_TeleportingDisabled);
         levitationEnabled = !(pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_LevitationDisabled);
 
-        for (std::vector<std::string>::const_iterator it = pcdt.mKnownDialogueTopics.begin();
-             it != pcdt.mKnownDialogueTopics.end(); ++it)
+        for (const auto & knownDialogueTopic : pcdt.mKnownDialogueTopics)
         {
-            outDialogueTopics.push_back(Misc::StringUtils::lowerCase(*it));
+            outDialogueTopics.push_back(Misc::StringUtils::lowerCase(knownDialogueTopic));
         }
 
         controls.mViewSwitchDisabled = pcdt.mPNAM.mPlayerFlags & PCDT::PlayerFlags_ViewSwitchDisabled;
@@ -78,9 +78,8 @@ namespace ESSImport
 
         if (pcdt.mHasENAM)
         {
-            const int cellSize = 8192;
-            out.mLastKnownExteriorPosition[0] = (pcdt.mENAM.mCellX + 0.5f) * cellSize;
-            out.mLastKnownExteriorPosition[1] = (pcdt.mENAM.mCellY + 0.5f) * cellSize;
+            out.mLastKnownExteriorPosition[0] = (pcdt.mENAM.mCellX + 0.5f) * Constants::CellSizeInUnits;
+            out.mLastKnownExteriorPosition[1] = (pcdt.mENAM.mCellY + 0.5f) * Constants::CellSizeInUnits;
             out.mLastKnownExteriorPosition[2] = 0.0f;
         }
     }

apps/essimporter/convertscpt.cpp

@@ -11,6 +11,7 @@ namespace ESSImport
     {
         out.mId = Misc::StringUtils::lowerCase(scpt.mSCHD.mName.toString());
         out.mRunning = scpt.mRunning;
+        out.mTargetRef.unset(); // TODO: convert target reference of global script
         convertSCRI(scpt.mSCRI, out.mLocals);
     }
 

apps/essimporter/convertscri.cpp

@@ -1,18 +1,16 @@
 #include "convertscri.hpp"
 
-#include <iostream>
-
 namespace
 {
 
     template <typename T, ESM::VarType VariantType>
     void storeVariables(const std::vector<T>& variables, ESM::Locals& locals, const std::string& scriptname)
     {
-        for (typename std::vector<T>::const_iterator it = variables.begin(); it != variables.end(); ++it)
+        for (const auto& variable : variables)
         {
-            ESM::Variant val(*it);
+            ESM::Variant val(variable);
             val.setType(VariantType);
-            locals.mVariables.push_back(std::make_pair(std::string(), val));
+            locals.mVariables.emplace_back(std::string(), val);
         }
     }
 

apps/essimporter/importacdt.hpp

@@ -86,7 +86,9 @@ namespace ESSImport
         bool mHasANIS;
         ANIS mANIS; // scripted animation state
 
-        void load(ESM::ESMReader& esm);
+        virtual void load(ESM::ESMReader& esm);
+
+        virtual ~ActorData() = default;
     };
 
 }

apps/essimporter/importcellref.hpp

@@ -25,7 +25,9 @@ namespace ESSImport
 
         bool mDeleted;
 
-        void load(ESM::ESMReader& esm);
+        void load(ESM::ESMReader& esm) override;
+
+        virtual ~CellRef() = default;
     };
 
 }

apps/essimporter/importer.cpp

@@ -2,6 +2,7 @@
 
 #include <iomanip>
 
+#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include <osgDB/ReadFile>
@@ -15,15 +16,14 @@
 #include <components/esm/player.hpp>
 
 #include <components/esm/loadalch.hpp>
-#include <components/esm/loadclas.hpp>
 #include <components/esm/loadspel.hpp>
 #include <components/esm/loadarmo.hpp>
 #include <components/esm/loadweap.hpp>
 #include <components/esm/loadclot.hpp>
 #include <components/esm/loadench.hpp>
-#include <components/esm/loadweap.hpp>
 #include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadglob.hpp>
+
+#include <components/misc/constants.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -46,7 +46,7 @@ namespace
         image->allocateImage(128, 128, 1, GL_RGB, GL_UNSIGNED_BYTE);
 
         // need to convert pixel format from BGRA to RGB as the jpg readerwriter doesn't support it otherwise
-        std::vector<unsigned char>::const_iterator it = fileHeader.mSCRS.begin();
+        auto it = fileHeader.mSCRS.begin();
         for (int y=0; y<128; ++y)
         {
             for (int x=0; x<128; ++x)
@@ -314,10 +314,9 @@ namespace ESSImport
 
         std::set<unsigned int> unknownRecords;
 
-        for (std::map<unsigned int, std::shared_ptr<Converter> >::const_iterator it = converters.begin();
-             it != converters.end(); ++it)
+        for (const auto & converter : converters)
         {
-            it->second->setContext(context);
+            converter.second->setContext(context);
         }
 
         while (esm.hasMoreRecs())
@@ -325,7 +324,7 @@ namespace ESSImport
             ESM::NAME n = esm.getRecName();
             esm.getRecHeader();
 
-            std::map<unsigned int, std::shared_ptr<Converter> >::iterator it = converters.find(n.intval);
+            auto it = converters.find(n.intval);
             if (it != converters.end())
             {
                 it->second->read(esm);
@@ -347,7 +346,7 @@ namespace ESSImport
 
         writer.setFormat (ESM::SavedGame::sCurrentFormat);
 
-        std::ofstream stream(mOutFile.c_str(), std::ios::binary);
+        boost::filesystem::ofstream stream(boost::filesystem::path(mOutFile), std::ios::out | std::ios::binary);
         // all unused
         writer.setVersion(0);
         writer.setType(0);
@@ -355,17 +354,15 @@ namespace ESSImport
         writer.setDescription("");
         writer.setRecordCount (0);
 
-        for (std::vector<ESM::Header::MasterData>::const_iterator it = header.mMaster.begin();
-             it != header.mMaster.end(); ++it)
-            writer.addMaster (it->name, 0); // not using the size information anyway -> use value of 0
+        for (const auto & master : header.mMaster)
+            writer.addMaster(master.name, 0); // not using the size information anyway -> use value of 0
 
         writer.save (stream);
 
         ESM::SavedGame profile;
-        for (std::vector<ESM::Header::MasterData>::const_iterator it = header.mMaster.begin();
-             it != header.mMaster.end(); ++it)
+        for (const auto & master : header.mMaster)
         {
-            profile.mContentFiles.push_back(it->name);
+            profile.mContentFiles.push_back(master.name);
         }
         profile.mDescription = esm.getDesc();
         profile.mInGameTime.mDay = context.mDay;
@@ -413,9 +410,8 @@ namespace ESSImport
         if (context.mPlayer.mCellId.mPaged)
         {
             // exterior cell -> determine cell coordinates based on position
-            const int cellSize = 8192;
-            int cellX = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[0]/cellSize));
-            int cellY = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[1] / cellSize));
+            int cellX = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[0] / Constants::CellSizeInUnits));
+            int cellY = static_cast<int>(std::floor(context.mPlayer.mObject.mPosition.pos[1] / Constants::CellSizeInUnits));
             context.mPlayer.mCellId.mIndex.mX = cellX;
             context.mPlayer.mCellId.mIndex.mY = cellY;
         }

apps/essimporter/importercontext.hpp

@@ -63,7 +63,6 @@ namespace ESSImport
             , mHour(0.f)
             , mNextActorId(0)
         {
-            mPlayer.mAutoMove = 0;
             ESM::CellId playerCellId;
             playerCellId.mPaged = true;
             playerCellId.mIndex.mX = playerCellId.mIndex.mY = 0;
@@ -84,6 +83,8 @@ namespace ESSImport
             mGlobalMapState.mBounds.mMaxX = 0;
             mGlobalMapState.mBounds.mMinY = 0;
             mGlobalMapState.mBounds.mMaxY = 0;
+
+            mPlayerBase.blank();
         }
 
         int generateActorId()

apps/essimporter/importgame.hpp

@@ -14,13 +14,13 @@ namespace ESSImport
     {
         struct GMDT
         {
-           char mCellName[64];
-           int mFogColour;
-           float mFogDensity;
-           int mCurrentWeather, mNextWeather;
-           int mWeatherTransition; // 0-100 transition between weathers, top 3 bytes may be garbage
-           float mTimeOfNextTransition; // weather changes when gamehour == timeOfNextTransition
-           int mMasserPhase, mSecundaPhase; // top 3 bytes may be garbage
+           char mCellName[64] {};
+           int mFogColour {0};
+           float mFogDensity {0.f};
+           int mCurrentWeather {0}, mNextWeather {0};
+           int mWeatherTransition {0}; // 0-100 transition between weathers, top 3 bytes may be garbage
+           float mTimeOfNextTransition {0.f}; // weather changes when gamehour == timeOfNextTransition
+           int mMasserPhase {0}, mSecundaPhase {0}; // top 3 bytes may be garbage
         };
 
         GMDT mGMDT;

apps/essimporter/importinventory.cpp

@@ -4,8 +4,6 @@
 
 #include <components/esm/esmreader.hpp>
 
-#include <components/esm/loadcont.hpp>
-
 namespace ESSImport
 {
 
@@ -13,7 +11,7 @@ namespace ESSImport
     {
         while (esm.isNextSub("NPCO"))
         {
-            ESM::ContItem contItem;
+            ContItem contItem;
             esm.getHT(contItem);
 
             InventoryItem item;
@@ -21,6 +19,7 @@ namespace ESSImport
             item.mCount = contItem.mCount;
             item.mRelativeEquipmentSlot = -1;
             item.mLockLevel = 0;
+            item.mRefNum.unset();
 
             unsigned int itemCount = std::abs(item.mCount);
             bool separateStacks = false;

apps/essimporter/importinventory.hpp

@@ -5,6 +5,8 @@
 #include <string>
 
 #include <components/esm/cellref.hpp>
+#include <components/esm/esmcommon.hpp>
+
 #include "importscri.hpp"
 
 namespace ESM
@@ -15,6 +17,12 @@ namespace ESM
 namespace ESSImport
 {
 
+    struct ContItem
+    {
+        int mCount;
+        ESM::NAME32 mItem;
+    };
+
     struct Inventory
     {
         struct InventoryItem : public ESM::CellRef

apps/essimporter/importscpt.hpp

@@ -13,10 +13,16 @@ namespace ESM
 namespace ESSImport
 {
 
+    struct SCHD
+    {
+        ESM::NAME32              mName;
+        ESM::Script::SCHDstruct  mData;
+    };
+
     // A running global script
     struct SCPT
     {
-        ESM::Script::SCHD mSCHD;
+        SCHD mSCHD;
 
         // values of local variables
         SCRI mSCRI;

apps/essimporter/main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char** argv)
         else
         {
             const std::string& ext = ".omwsave";
-            if (boost::filesystem::exists(boost::filesystem::path(outputFile))
+            if (bfs::exists(bfs::path(outputFile))
                     && (outputFile.size() < ext.size() || outputFile.substr(outputFile.size()-ext.size()) != ext))
             {
                 throw std::runtime_error("Output file already exists and does not end in .omwsave. Did you mean to use --compare?");

apps/launcher/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(LAUNCHER
     datafilespage.cpp
     graphicspage.cpp
+    sdlinit.cpp
     main.cpp
     maindialog.cpp
     playpage.cpp
@@ -12,6 +13,7 @@ set(LAUNCHER
     utils/profilescombobox.cpp
     utils/textinputdialog.cpp
     utils/lineedit.cpp
+    utils/openalutil.cpp
 
     ${CMAKE_SOURCE_DIR}/files/windows/launcher.rc
 )
@@ -19,6 +21,7 @@ set(LAUNCHER
 set(LAUNCHER_HEADER
     datafilespage.hpp
     graphicspage.hpp
+    sdlinit.hpp
     maindialog.hpp
     playpage.hpp
     textslotmsgbox.hpp
@@ -29,6 +32,7 @@ set(LAUNCHER_HEADER
     utils/profilescombobox.hpp
     utils/textinputdialog.hpp
     utils/lineedit.hpp
+    utils/openalutil.hpp
 )
 
 # Headers that must be pre-processed
@@ -45,6 +49,7 @@ set(LAUNCHER_HEADER_MOC
     utils/textinputdialog.hpp
     utils/profilescombobox.hpp
     utils/lineedit.hpp
+    utils/openalutil.hpp
 
 )
 
@@ -68,16 +73,9 @@ if(WIN32)
     set(QT_USE_QTMAIN TRUE)
 endif(WIN32)
 
-if (DESIRED_QT_VERSION MATCHES 4)
-    include(${QT_USE_FILE})
-    QT4_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-    QT4_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
-    QT4_WRAP_UI(UI_HDRS ${LAUNCHER_UI})
-else()
-    QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-    QT5_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
-    QT5_WRAP_UI(UI_HDRS ${LAUNCHER_UI})
-endif()
+QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
+QT5_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
+QT5_WRAP_UI(UI_HDRS ${LAUNCHER_UI})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 if(NOT WIN32)
@@ -100,17 +98,11 @@ endif (WIN32)
 
 target_link_libraries(openmw-launcher
     ${SDL2_LIBRARY_ONLY}
+    ${OPENAL_LIBRARY}
     components
 )
 
-if (DESIRED_QT_VERSION MATCHES 4)
-    target_link_libraries(openmw-launcher ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
-    if(WIN32)
-        target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
-    endif(WIN32)
-else()
-    target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
-endif()
+target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
 
 if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)

apps/launcher/advancedpage.cpp

@@ -1,33 +1,45 @@
 #include "advancedpage.hpp"
 
+#include <array>
+
 #include <components/config/gamesettings.hpp>
-#include <components/config/launchersettings.hpp>
 #include <QFileDialog>
 #include <QCompleter>
+#include <QString>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
 
-Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg,
-                                     Config::GameSettings &gameSettings,
-                                     Settings::Manager &engineSettings, QWidget *parent)
+#include <cmath>
+
+#include "utils/openalutil.hpp"
+
+Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent)
         : QWidget(parent)
-        , mCfgMgr(cfg)
         , mGameSettings(gameSettings)
-        , mEngineSettings(engineSettings)
 {
     setObjectName ("AdvancedPage");
     setupUi(this);
 
+    for(const char * name : Launcher::enumerateOpenALDevices())
+    {
+        audioDeviceSelectorComboBox->addItem(QString::fromUtf8(name), QString::fromUtf8(name));
+    }
+    for(const char * name : Launcher::enumerateOpenALDevicesHrtf())
+    {
+        hrtfProfileSelectorComboBox->addItem(QString::fromUtf8(name), QString::fromUtf8(name));
+    }
+
     loadSettings();
+
+    mCellNameCompleter.setModel(&mCellNameCompleterModel);
+    startDefaultCharacterAtField->setCompleter(&mCellNameCompleter);
 }
 
 void Launcher::AdvancedPage::loadCellsForAutocomplete(QStringList cellNames) {
-    // Set up an auto-completer for the "Start default character at" field
-    auto *completer = new QCompleter(cellNames);
-    completer->setCompletionMode(QCompleter::PopupCompletion);
-    completer->setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
-    startDefaultCharacterAtField->setCompleter(completer);
-
+    // Update the list of suggestions for the "Start default character at" field
+    mCellNameCompleterModel.setStringList(cellNames);
+    mCellNameCompleter.setCompletionMode(QCompleter::PopupCompletion);
+    mCellNameCompleter.setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
 }
 
 void Launcher::AdvancedPage::on_skipMenuCheckBox_stateChanged(int state) {
@@ -55,122 +67,366 @@ void Launcher::AdvancedPage::on_runScriptAfterStartupBrowseButton_clicked()
     runScriptAfterStartupField->setText(path);
 }
 
+namespace
+{
+    constexpr double CellSizeInUnits = 8192;
+
+    double convertToCells(double unitRadius)
+    {
+        return std::round((unitRadius + 1024) / CellSizeInUnits);
+    }
+
+    double convertToUnits(double CellGridRadius)
+    {
+        return CellSizeInUnits * CellGridRadius - 1024;
+    }
+}
+
 bool Launcher::AdvancedPage::loadSettings()
 {
+    // Game mechanics
+    {
+        loadSettingBool(toggleSneakCheckBox, "toggle sneak", "Input");
+        loadSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
+        loadSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
+        loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
+        loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
+        loadSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
+        loadSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
+        loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
+        loadSettingBool(uncappedDamageFatigueCheckBox, "uncapped damage fatigue", "Game");
+        loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
+        loadSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
+        loadSettingBool(avoidCollisionsCheckBox, "NPCs avoid collisions", "Game");
+        int unarmedFactorsStrengthIndex = Settings::Manager::getInt("strength influences hand to hand", "Game");
+        if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2)
+            unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
+        loadSettingBool(stealingFromKnockedOutCheckBox, "always allow stealing from knocked out actors", "Game");
+        loadSettingBool(enableNavigatorCheckBox, "enable", "Navigator");
+        int numPhysicsThreads = Settings::Manager::getInt("async num threads", "Physics");
+        if (numPhysicsThreads >= 0)
+            physicsThreadsSpinBox->setValue(numPhysicsThreads);
+        loadSettingBool(allowNPCToFollowOverWaterSurfaceCheckBox, "allow actors to follow over water surface", "Game");
+    }
+
+    // Visuals
+    {
+        loadSettingBool(autoUseObjectNormalMapsCheckBox, "auto use object normal maps", "Shaders");
+        loadSettingBool(autoUseObjectSpecularMapsCheckBox, "auto use object specular maps", "Shaders");
+        loadSettingBool(autoUseTerrainNormalMapsCheckBox, "auto use terrain normal maps", "Shaders");
+        loadSettingBool(autoUseTerrainSpecularMapsCheckBox, "auto use terrain specular maps", "Shaders");
+        loadSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
+        loadSettingBool(radialFogCheckBox, "radial fog", "Shaders");
+        loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
+        connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
+        loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
+        if (animSourcesCheckBox->checkState() != Qt::Unchecked)
+        {
+            loadSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
+            loadSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
+        }
+        loadSettingBool(turnToMovementDirectionCheckBox, "turn to movement direction", "Game");
+        loadSettingBool(smoothMovementCheckBox, "smooth movement", "Game");
+
+        const bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
+        const bool objectPaging = Settings::Manager::getBool("object paging", "Terrain");
+        if (distantTerrain && objectPaging) {
+            distantLandCheckBox->setCheckState(Qt::Checked);
+        }
+
+        loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
+        viewingDistanceComboBox->setValue(convertToCells(Settings::Manager::getInt("viewing distance", "Camera")));
+        objectPagingMinSizeComboBox->setValue(Settings::Manager::getDouble("object paging min size", "Terrain"));
+    }
+
+    // Audio
+    {
+        std::string selectedAudioDevice = Settings::Manager::getString("device", "Sound");
+        if (selectedAudioDevice.empty() == false)
+        {
+            int audioDeviceIndex = audioDeviceSelectorComboBox->findData(QString::fromStdString(selectedAudioDevice));
+            if (audioDeviceIndex != -1)
+            {
+                audioDeviceSelectorComboBox->setCurrentIndex(audioDeviceIndex);
+            }
+        }
+        int hrtfEnabledIndex = Settings::Manager::getInt("hrtf enable", "Sound");
+        if (hrtfEnabledIndex >= -1 && hrtfEnabledIndex <= 1)
+        {
+            enableHRTFComboBox->setCurrentIndex(hrtfEnabledIndex + 1);
+        }
+        std::string selectedHRTFProfile = Settings::Manager::getString("hrtf", "Sound");
+        if (selectedHRTFProfile.empty() == false)
+        {
+            int hrtfProfileIndex = hrtfProfileSelectorComboBox->findData(QString::fromStdString(selectedHRTFProfile));
+            if (hrtfProfileIndex != -1)
+            {
+                hrtfProfileSelectorComboBox->setCurrentIndex(hrtfProfileIndex);
+            }
+        }
+    }
+
+
+    // Camera
+    {
+        loadSettingBool(viewOverShoulderCheckBox, "view over shoulder", "Camera");
+        connect(viewOverShoulderCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotViewOverShoulderToggled(bool)));
+        viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
+        loadSettingBool(autoSwitchShoulderCheckBox, "auto switch shoulder", "Camera");
+        loadSettingBool(previewIfStandStillCheckBox, "preview if stand still", "Camera");
+        loadSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
+        loadSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
+        defaultShoulderComboBox->setCurrentIndex(
+            Settings::Manager::getVector2("view over shoulder offset", "Camera").x() >= 0 ? 0 : 1);
+    }
+
+    // Interface Changes
+    {
+        loadSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
+        loadSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
+        loadSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
+        loadSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
+        loadSettingBool(changeDialogTopicsCheckBox, "color topic enable", "GUI");
+        int showOwnedIndex = Settings::Manager::getInt("show owned", "Game");
+        // Match the index with the option (only 0, 1, 2, or 3 are valid). Will default to 0 if invalid.
+        if (showOwnedIndex >= 0 && showOwnedIndex <= 3)
+            showOwnedComboBox->setCurrentIndex(showOwnedIndex);
+        loadSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        loadSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
+        scalingSpinBox->setValue(Settings::Manager::getFloat("scaling factor", "GUI"));
+    }
+
+    // Bug fixes
+    {
+        loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
+        loadSettingBool(trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
+    }
+
+    // Miscellaneous
+    {
+        // Saves
+        loadSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
+        maximumQuicksavesComboBox->setValue(Settings::Manager::getInt("max quicksaves", "Saves"));
+
+        // Other Settings
+        QString screenshotFormatString = QString::fromStdString(Settings::Manager::getString("screenshot format", "General")).toUpper();
+        if (screenshotFormatComboBox->findText(screenshotFormatString) == -1)
+            screenshotFormatComboBox->addItem(screenshotFormatString);
+        screenshotFormatComboBox->setCurrentIndex(screenshotFormatComboBox->findText(screenshotFormatString));
+    }
+
     // Testing
-    bool skipMenu = mGameSettings.value("skip-menu").toInt() == 1;
-    if (skipMenu) {
-        skipMenuCheckBox->setCheckState(Qt::Checked);
-    }
-    startDefaultCharacterAtLabel->setEnabled(skipMenu);
-    startDefaultCharacterAtField->setEnabled(skipMenu);
-
-    startDefaultCharacterAtField->setText(mGameSettings.value("start"));
-    runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
-
-    // Game Settings
-    loadSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
-    loadSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
-    loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
-    loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
-    loadSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game");
-    loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
-    loadSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
-
-    // Input Settings
-    loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
-    loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
-    loadSettingBool(toggleSneakCheckBox, "toggle sneak", "Input");
-
-    // Saves Settings
-    loadSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
-    maximumQuicksavesComboBox->setValue(mEngineSettings.getInt("max quicksaves", "Saves"));
-
-    // User Interface Settings
-    loadSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
-    loadSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
-    loadSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
-    loadSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
-    int showOwnedIndex = mEngineSettings.getInt("show owned", "Game");
-    // Match the index with the option (only 0, 1, 2, or 3 are valid). Will default to 0 if invalid.
-    if (showOwnedIndex >= 0 && showOwnedIndex <= 3)
-        showOwnedComboBox->setCurrentIndex(showOwnedIndex);
-
-    // Other Settings
-    QString screenshotFormatString = QString::fromStdString(mEngineSettings.getString("screenshot format", "General")).toUpper();
-    if (screenshotFormatComboBox->findText(screenshotFormatString) == -1)
-        screenshotFormatComboBox->addItem(screenshotFormatString);
-    screenshotFormatComboBox->setCurrentIndex(screenshotFormatComboBox->findText(screenshotFormatString));
+    {
+        loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
+
+        bool skipMenu = mGameSettings.value("skip-menu").toInt() == 1;
+        if (skipMenu)
+        {
+            skipMenuCheckBox->setCheckState(Qt::Checked);
+        }
+        startDefaultCharacterAtLabel->setEnabled(skipMenu);
+        startDefaultCharacterAtField->setEnabled(skipMenu);
 
+        startDefaultCharacterAtField->setText(mGameSettings.value("start"));
+        runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
+    }
     return true;
 }
 
 void Launcher::AdvancedPage::saveSettings()
 {
-    // Ensure we only set the new settings if they changed. This is to avoid cluttering the
-    // user settings file (which by definition should only contain settings the user has touched)
+    // Game mechanics
+    {
+        saveSettingBool(toggleSneakCheckBox, "toggle sneak", "Input");
+        saveSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
+        saveSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
+        saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
+        saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
+        saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
+        saveSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
+        saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
+        saveSettingBool(uncappedDamageFatigueCheckBox, "uncapped damage fatigue", "Game");
+        saveSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
+        saveSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
+        saveSettingBool(avoidCollisionsCheckBox, "NPCs avoid collisions", "Game");
+        int unarmedFactorsStrengthIndex = unarmedFactorsStrengthComboBox->currentIndex();
+        if (unarmedFactorsStrengthIndex != Settings::Manager::getInt("strength influences hand to hand", "Game"))
+            Settings::Manager::setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
+        saveSettingBool(stealingFromKnockedOutCheckBox, "always allow stealing from knocked out actors", "Game");
+        saveSettingBool(enableNavigatorCheckBox, "enable", "Navigator");
+        int numPhysicsThreads = physicsThreadsSpinBox->value();
+        if (numPhysicsThreads != Settings::Manager::getInt("async num threads", "Physics"))
+            Settings::Manager::setInt("async num threads", "Physics", numPhysicsThreads);
+    }
+
+    // Visuals
+    {
+        saveSettingBool(autoUseObjectNormalMapsCheckBox, "auto use object normal maps", "Shaders");
+        saveSettingBool(autoUseObjectSpecularMapsCheckBox, "auto use object specular maps", "Shaders");
+        saveSettingBool(autoUseTerrainNormalMapsCheckBox, "auto use terrain normal maps", "Shaders");
+        saveSettingBool(autoUseTerrainSpecularMapsCheckBox, "auto use terrain specular maps", "Shaders");
+        saveSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
+        saveSettingBool(radialFogCheckBox, "radial fog", "Shaders");
+        saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
+        saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
+        saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
+        saveSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
+        saveSettingBool(turnToMovementDirectionCheckBox, "turn to movement direction", "Game");
+        saveSettingBool(smoothMovementCheckBox, "smooth movement", "Game");
+
+        const bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
+        const bool objectPaging = Settings::Manager::getBool("object paging", "Terrain");
+        const bool wantDistantLand = distantLandCheckBox->checkState();
+        if (wantDistantLand != (distantTerrain && objectPaging)) {
+            Settings::Manager::setBool("distant terrain", "Terrain", wantDistantLand);
+            Settings::Manager::setBool("object paging", "Terrain", wantDistantLand);
+        }
+
+        saveSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
+        double viewingDistance = viewingDistanceComboBox->value();
+        if (viewingDistance != convertToCells(Settings::Manager::getInt("viewing distance", "Camera")))
+        {
+            Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
+        }
+        double objectPagingMinSize = objectPagingMinSizeComboBox->value();
+        if (objectPagingMinSize != Settings::Manager::getDouble("object paging min size", "Terrain"))
+            Settings::Manager::setDouble("object paging min size", "Terrain", objectPagingMinSize);
+    }
+    
+    // Audio
+    {
+        int audioDeviceIndex = audioDeviceSelectorComboBox->currentIndex();
+        if (audioDeviceIndex != 0)
+        {
+            Settings::Manager::setString("device", "Sound", audioDeviceSelectorComboBox->currentText().toUtf8().constData());
+        } 
+        else 
+        {
+            Settings::Manager::setString("device", "Sound", "");
+        }
+        int hrtfEnabledIndex = enableHRTFComboBox->currentIndex() - 1;
+        if (hrtfEnabledIndex != Settings::Manager::getInt("hrtf enable", "Sound"))
+        {
+            Settings::Manager::setInt("hrtf enable", "Sound", hrtfEnabledIndex);
+        }
+        int selectedHRTFProfileIndex = hrtfProfileSelectorComboBox->currentIndex();
+        if (selectedHRTFProfileIndex != 0)
+        {
+            Settings::Manager::setString("hrtf", "Sound", hrtfProfileSelectorComboBox->currentText().toUtf8().constData());
+        }
+        else 
+        {
+            Settings::Manager::setString("hrtf", "Sound", "");
+        }
+    }
+
+    // Camera
+    {
+        saveSettingBool(viewOverShoulderCheckBox, "view over shoulder", "Camera");
+        saveSettingBool(autoSwitchShoulderCheckBox, "auto switch shoulder", "Camera");
+        saveSettingBool(previewIfStandStillCheckBox, "preview if stand still", "Camera");
+        saveSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
+        saveSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
+
+        osg::Vec2f shoulderOffset = Settings::Manager::getVector2("view over shoulder offset", "Camera");
+        if (defaultShoulderComboBox->currentIndex() != (shoulderOffset.x() >= 0 ? 0 : 1))
+        {
+            if (defaultShoulderComboBox->currentIndex() == 0)
+                shoulderOffset.x() = std::abs(shoulderOffset.x());
+            else
+                shoulderOffset.x() = -std::abs(shoulderOffset.x());
+            Settings::Manager::setVector2("view over shoulder offset", "Camera", shoulderOffset);
+        }
+    }
+
+    // Interface Changes
+    {
+        saveSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
+        saveSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
+        saveSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
+        saveSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
+        saveSettingBool(changeDialogTopicsCheckBox, "color topic enable", "GUI");
+        int showOwnedCurrentIndex = showOwnedComboBox->currentIndex();
+        if (showOwnedCurrentIndex != Settings::Manager::getInt("show owned", "Game"))
+            Settings::Manager::setInt("show owned", "Game", showOwnedCurrentIndex);
+        saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
+        float uiScalingFactor = scalingSpinBox->value();
+        if (uiScalingFactor != Settings::Manager::getFloat("scaling factor", "GUI"))
+            Settings::Manager::setFloat("scaling factor", "GUI", uiScalingFactor);
+    }
+
+    // Bug fixes
+    {
+        saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
+        saveSettingBool(trainersTrainingSkillsBasedOnBaseSkillCheckBox, "trainers training skills based on base skill", "Game");
+    }
+
+    // Miscellaneous
+    {
+        // Saves Settings
+        saveSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
+        int maximumQuicksaves = maximumQuicksavesComboBox->value();
+        if (maximumQuicksaves != Settings::Manager::getInt("max quicksaves", "Saves"))
+        {
+            Settings::Manager::setInt("max quicksaves", "Saves", maximumQuicksaves);
+        }
+
+        // Other Settings
+        std::string screenshotFormatString = screenshotFormatComboBox->currentText().toLower().toStdString();
+        if (screenshotFormatString != Settings::Manager::getString("screenshot format", "General"))
+            Settings::Manager::setString("screenshot format", "General", screenshotFormatString);
+    }
 
     // Testing
-    int skipMenu = skipMenuCheckBox->checkState() == Qt::Checked;
-    if (skipMenu != mGameSettings.value("skip-menu").toInt())
-        mGameSettings.setValue("skip-menu", QString::number(skipMenu));
-
-    QString startCell = startDefaultCharacterAtField->text();
-    if (startCell != mGameSettings.value("start")) {
-        mGameSettings.setValue("start", startCell);
-    }
-    QString scriptRun = runScriptAfterStartupField->text();
-    if (scriptRun != mGameSettings.value("script-run"))
-        mGameSettings.setValue("script-run", scriptRun);
-
-    // Game Settings
-    saveSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
-    saveSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
-    saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
-    saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
-    saveSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game");
-    saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
-    saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");
-
-    // Input Settings
-    saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
-    saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");
-    saveSettingBool(toggleSneakCheckBox, "toggle sneak", "Input");
-
-    // Saves Settings
-    saveSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
-    int maximumQuicksaves = maximumQuicksavesComboBox->value();
-    if (maximumQuicksaves != mEngineSettings.getInt("max quicksaves", "Saves")) {
-        mEngineSettings.setInt("max quicksaves", "Saves", maximumQuicksaves);
-    }
-
-    // User Interface Settings
-    saveSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
-    saveSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
-    saveSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
-    saveSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
-    int showOwnedCurrentIndex = showOwnedComboBox->currentIndex();
-    if (showOwnedCurrentIndex != mEngineSettings.getInt("show owned", "Game"))
-        mEngineSettings.setInt("show owned", "Game", showOwnedCurrentIndex);
-
-    // Other Settings
-    std::string screenshotFormatString = screenshotFormatComboBox->currentText().toLower().toStdString();
-    if (screenshotFormatString != mEngineSettings.getString("screenshot format", "General"))
-        mEngineSettings.setString("screenshot format", "General", screenshotFormatString);
+    {
+        saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");
+
+        int skipMenu = skipMenuCheckBox->checkState() == Qt::Checked;
+        if (skipMenu != mGameSettings.value("skip-menu").toInt())
+            mGameSettings.setValue("skip-menu", QString::number(skipMenu));
+
+        QString startCell = startDefaultCharacterAtField->text();
+        if (startCell != mGameSettings.value("start"))
+        {
+            mGameSettings.setValue("start", startCell);
+        }
+        QString scriptRun = runScriptAfterStartupField->text();
+        if (scriptRun != mGameSettings.value("script-run"))
+            mGameSettings.setValue("script-run", scriptRun);
+    }
 }
 
-void Launcher::AdvancedPage::loadSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group) {
-    if (mEngineSettings.getBool(setting, group))
+void Launcher::AdvancedPage::loadSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group)
+{
+    if (Settings::Manager::getBool(setting, group))
         checkbox->setCheckState(Qt::Checked);
 }
 
-void Launcher::AdvancedPage::saveSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group) {
+void Launcher::AdvancedPage::saveSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group)
+{
     bool cValue = checkbox->checkState();
-    if (cValue != mEngineSettings.getBool(setting, group))
-        mEngineSettings.setBool(setting, group, cValue);
+    if (cValue != Settings::Manager::getBool(setting, group))
+        Settings::Manager::setBool(setting, group, cValue);
 }
 
 void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
 {
     loadCellsForAutocomplete(cellNames);
 }
+
+void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
+{
+    weaponSheathingCheckBox->setEnabled(checked);
+    shieldSheathingCheckBox->setEnabled(checked);
+    if (!checked)
+    {
+        weaponSheathingCheckBox->setCheckState(Qt::Unchecked);
+        shieldSheathingCheckBox->setCheckState(Qt::Unchecked);
+    }
+}
+
+void Launcher::AdvancedPage::slotViewOverShoulderToggled(bool checked)
+{
+    viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
+}

apps/launcher/advancedpage.hpp

@@ -1,13 +1,13 @@
 #ifndef ADVANCEDPAGE_H
 #define ADVANCEDPAGE_H
 
-#include <QWidget>
+#include <QCompleter>
+#include <QStringListModel>
 
 #include "ui_advancedpage.h"
 
 #include <components/settings/settings.hpp>
 
-namespace Files { struct ConfigurationManager; }
 namespace Config { class GameSettings; }
 
 namespace Launcher
@@ -17,8 +17,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                     Settings::Manager &engineSettings, QWidget *parent = 0);
+        explicit AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
         void saveSettings();
@@ -29,11 +28,13 @@ namespace Launcher
     private slots:
         void on_skipMenuCheckBox_stateChanged(int state);
         void on_runScriptAfterStartupBrowseButton_clicked();
+        void slotAnimSourcesToggled(bool checked);
+        void slotViewOverShoulderToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
         Config::GameSettings &mGameSettings;
-        Settings::Manager &mEngineSettings;
+        QCompleter mCellNameCompleter;
+        QStringListModel mCellNameCompleterModel;
 
         /**
          * Load the cells associated with the given content files for use in autocomplete

apps/launcher/datafilespage.cpp

@@ -4,7 +4,6 @@
 
 #include <QPushButton>
 #include <QMessageBox>
-#include <QCheckBox>
 #include <QMenu>
 #include <QSortFilterProxyModel>
 #include <thread>
@@ -14,7 +13,6 @@
 #include <components/files/configurationmanager.hpp>
 
 #include <components/contentselector/model/esmfile.hpp>
-#include <components/contentselector/model/naturalsort.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 
 #include <components/config/gamesettings.hpp>
@@ -36,11 +34,16 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
     ui.setupUi (this);
     setObjectName ("DataFilesPage");
     mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget);
+    const QString encoding = mGameSettings.value("encoding", "win1252");
+    mSelector->setEncoding(encoding);
 
-    mProfileDialog = new TextInputDialog(tr("New Content List"), tr("Content List name:"), this);
+    mNewProfileDialog = new TextInputDialog(tr("New Content List"), tr("Content List name:"), this);
+    mCloneProfileDialog = new TextInputDialog(tr("Clone Content List"), tr("Content List name:"), this);
 
-    connect(mProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
-            this, SLOT(updateOkButton(QString)));
+    connect(mNewProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
+            this, SLOT(updateNewProfileOkButton(QString)));
+    connect(mCloneProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
+            this, SLOT(updateCloneProfileOkButton(QString)));
 
     buildView();
     loadSettings();
@@ -57,9 +60,13 @@ void Launcher::DataFilesPage::buildView()
 {
     ui.verticalLayout->insertWidget (0, mSelector->uiWidget());
 
+    QToolButton * refreshButton = mSelector->refreshButton();    
+
     //tool buttons
     ui.newProfileButton->setToolTip ("Create a new Content List");
+    ui.cloneProfileButton->setToolTip ("Clone the current Content List");
     ui.deleteProfileButton->setToolTip ("Delete an existing Content List");
+    refreshButton->setToolTip("Refresh Data Files");
 
     //combo box
     ui.profilesComboBox->addItem(mDefaultContentListName);
@@ -68,7 +75,9 @@ void Launcher::DataFilesPage::buildView()
 
     // Add the actions to the toolbuttons
     ui.newProfileButton->setDefaultAction (ui.newProfileAction);
+    ui.cloneProfileButton->setDefaultAction (ui.cloneProfileAction);
     ui.deleteProfileButton->setDefaultAction (ui.deleteProfileAction);
+    refreshButton->setDefaultAction(ui.refreshDataFilesAction);
 
     //establish connections
     connect (ui.profilesComboBox, SIGNAL (currentIndexChanged(int)),
@@ -79,6 +88,8 @@ void Launcher::DataFilesPage::buildView()
 
     connect (ui.profilesComboBox, SIGNAL (signalProfileChanged(QString, QString)),
              this, SLOT (slotProfileChangedByUser(QString, QString)));
+
+    connect(ui.refreshDataFilesAction, SIGNAL(triggered()),this, SLOT(slotRefreshButtonClicked()));
 }
 
 bool Launcher::DataFilesPage::loadSettings()
@@ -88,7 +99,7 @@ bool Launcher::DataFilesPage::loadSettings()
 
     qDebug() << "The current profile is: " << currentProfile;
 
-    foreach (const QString &item, profiles)
+    for (const QString &item : profiles)
         addProfile (item, false);
 
     // Hack: also add the current profile
@@ -102,15 +113,16 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 {
     QStringList paths = mGameSettings.getDataDirs();
 
-    foreach(const QString &path, paths)
-        mSelector->addFiles(path);
-
     mDataLocal = mGameSettings.getDataLocal();
 
     if (!mDataLocal.isEmpty())
-        mSelector->addFiles(mDataLocal);
+        paths.insert(0, mDataLocal);
+
+    mSelector->clearFiles();
+
+    for (const QString &path : paths)
+        mSelector->addFiles(path);
 
-    paths.insert(0, mDataLocal);
     PathIterator pathIterator(paths);
 
     mSelector->setProfileContent(filesInProfile(contentModelName, pathIterator));
@@ -121,7 +133,7 @@ QStringList Launcher::DataFilesPage::filesInProfile(const QString& profileName,
     QStringList files = mLauncherSettings.getContentListFiles(profileName);
     QStringList filepaths;
 
-    foreach(const QString& file, files)
+    for (const QString& file : files)
     {
         QString filepath = pathIterator.findFirstPath(file);
 
@@ -146,7 +158,8 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
     mLauncherSettings.setCurrentContentListName(ui.profilesComboBox->currentText());
 
     QStringList fileNames;
-    foreach(const ContentSelectorModel::EsmFile *item, items) {
+    for (const ContentSelectorModel::EsmFile *item : items)
+    {
         fileNames.append(item->fileName());
     }
     mLauncherSettings.setContentList(profileName, fileNames);
@@ -158,8 +171,18 @@ QStringList Launcher::DataFilesPage::selectedFilePaths()
     //retrieve the files selected for the profile
     ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
     QStringList filePaths;
-    foreach(const ContentSelectorModel::EsmFile *item, items) {
-        filePaths.append(item->filePath());
+    for (const ContentSelectorModel::EsmFile *item : items)
+    {
+        QFile file(item->filePath());
+        
+        if(file.exists())
+        {
+            filePaths.append(item->filePath());
+        }
+        else
+        {
+            slotRefreshButtonClicked();
+        }
     }
     return filePaths;
 }
@@ -213,6 +236,18 @@ void Launcher::DataFilesPage::slotProfileDeleted (const QString &item)
     removeProfile (item);
 }
 
+void Launcher::DataFilesPage:: refreshDataFilesView ()
+{
+    QString currentProfile = ui.profilesComboBox->currentText();
+    saveSettings(currentProfile);
+    populateFileViews(currentProfile);
+}
+
+void Launcher::DataFilesPage::slotRefreshButtonClicked ()
+{
+    refreshDataFilesView();
+}
+
 void Launcher::DataFilesPage::slotProfileChangedByUser(const QString &previous, const QString &current)
 {
     setProfile(previous, current, true);
@@ -244,10 +279,10 @@ void Launcher::DataFilesPage::slotProfileChanged(int index)
 
 void Launcher::DataFilesPage::on_newProfileAction_triggered()
 {
-    if (mProfileDialog->exec() != QDialog::Accepted)
+    if (mNewProfileDialog->exec() != QDialog::Accepted)
         return;
 
-    QString profile = mProfileDialog->lineEdit()->text();
+    QString profile = mNewProfileDialog->lineEdit()->text();
 
     if (profile.isEmpty())
         return;
@@ -271,6 +306,20 @@ void Launcher::DataFilesPage::addProfile (const QString &profile, bool setAsCurr
         setProfile (ui.profilesComboBox->findText (profile), false);
 }
 
+void Launcher::DataFilesPage::on_cloneProfileAction_triggered()
+{
+    if (mCloneProfileDialog->exec() != QDialog::Accepted)
+        return;
+
+    QString profile = mCloneProfileDialog->lineEdit()->text();
+
+    if (profile.isEmpty())
+        return;
+
+    mLauncherSettings.setContentList(profile, selectedFilePaths());
+    addProfile(profile, true);
+}
+
 void Launcher::DataFilesPage::on_deleteProfileAction_triggered()
 {
     QString profile = ui.profilesComboBox->currentText();
@@ -293,17 +342,16 @@ void Launcher::DataFilesPage::on_deleteProfileAction_triggered()
     checkForDefaultProfile();
 }
 
-void Launcher::DataFilesPage::updateOkButton(const QString &text)
+void Launcher::DataFilesPage::updateNewProfileOkButton(const QString &text)
 {
     // We do this here because we need the profiles combobox text
-    if (text.isEmpty()) {
-         mProfileDialog->setOkButtonEnabled(false);
-         return;
-    }
+    mNewProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
+}
 
-    (ui.profilesComboBox->findText(text) == -1)
-            ? mProfileDialog->setOkButtonEnabled(true)
-            : mProfileDialog->setOkButtonEnabled(false);
+void Launcher::DataFilesPage::updateCloneProfileOkButton(const QString &text)
+{
+    // We do this here because we need the profiles combobox text
+    mCloneProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
 }
 
 void Launcher::DataFilesPage::checkForDefaultProfile()
@@ -354,7 +402,12 @@ void Launcher::DataFilesPage::reloadCells(QStringList selectedFiles)
 
     // The following code will run only if there is not another thread currently running it
     CellNameLoader cellNameLoader;
+#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+    QSet<QString> set = cellNameLoader.getCellNames(selectedFiles);
+    QStringList cellNamesList(set.begin(), set.end());
+#else
     QStringList cellNamesList = QStringList::fromSet(cellNameLoader.getCellNames(selectedFiles));
+#endif
     std::sort(cellNamesList.begin(), cellNamesList.end());
     emit signalLoadedCellsChanged(cellNamesList);
-}
+}

apps/launcher/datafilespage.hpp

@@ -6,7 +6,6 @@
 
 
 #include <QDir>
-#include <QFile>
 #include <QStringList>
 
 class QSortFilterProxyModel;
@@ -32,7 +31,7 @@ namespace Launcher
 
     public:
         explicit DataFilesPage (Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                                Config::LauncherSettings &launcherSettings, QWidget *parent = 0);
+                                Config::LauncherSettings &launcherSettings, QWidget *parent = nullptr);
 
         QAbstractItemModel* profilesModel() const;
 
@@ -61,10 +60,13 @@ namespace Launcher
         void slotProfileRenamed(const QString &previous, const QString &current);
         void slotProfileDeleted(const QString &item);
         void slotAddonDataChanged ();
+        void slotRefreshButtonClicked ();
 
-        void updateOkButton(const QString &text);
+        void updateNewProfileOkButton(const QString &text);
+        void updateCloneProfileOkButton(const QString &text);
 
         void on_newProfileAction_triggered();
+        void on_cloneProfileAction_triggered();
         void on_deleteProfileAction_triggered();
 
     public:
@@ -73,7 +75,8 @@ namespace Launcher
 
     private:
 
-        TextInputDialog *mProfileDialog;
+        TextInputDialog *mNewProfileDialog;
+        TextInputDialog *mCloneProfileDialog;
 
         Files::ConfigurationManager &mCfgMgr;
 
@@ -84,11 +87,7 @@ namespace Launcher
         QStringList previousSelectedFiles;
         QString mDataLocal;
 
-        void setPluginsCheckstates(Qt::CheckState state);
-
         void buildView();
-        void setupConfig();
-        void readConfig();
         void setProfile (int index, bool savePrevious);
         void setProfile (const QString &previous, const QString &current, bool savePrevious);
         void removeProfile (const QString &profile);
@@ -97,6 +96,7 @@ namespace Launcher
         void checkForDefaultProfile();
         void populateFileViews(const QString& contentModelName);
         void reloadCells(QStringList selectedFiles);
+        void refreshDataFilesView ();
 
         class PathIterator
         {

apps/launcher/graphicspage.cpp

@@ -1,10 +1,9 @@
 #include "graphicspage.hpp"
 
-#include <boost/math/common_factor.hpp>
-#include <csignal>
 #include <QDesktopWidget>
 #include <QMessageBox>
 #include <QDir>
+#include <QScreen>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #undef MAC_OS_X_VERSION_MIN_REQUIRED
@@ -12,14 +11,18 @@
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED
 
-#include <SDL.h>
 #include <SDL_video.h>
 
+#include <numeric>
+
 #include <components/files/configurationmanager.hpp>
 
 QString getAspect(int x, int y)
 {
-    int gcd = boost::math::gcd (x, y);
+    int gcd = std::gcd (x, y);
+    if (gcd == 0)
+        return QString();
+
     int xaspect = x / gcd;
     int yaspect = y / gcd;
     // special case: 8 : 5 is usually referred to as 16:10
@@ -29,10 +32,8 @@ QString getAspect(int x, int y)
     return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
 }
 
-Launcher::GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent)
+Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     : QWidget(parent)
-    , mCfgMgr(cfg)
-    , mEngineSettings(engineSettings)
 {
     setObjectName ("GraphicsPage");
     setupUi(this);
@@ -45,26 +46,14 @@ Launcher::GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, Settings:
     connect(fullScreenCheckBox, SIGNAL(stateChanged(int)), this, SLOT(slotFullScreenChanged(int)));
     connect(standardRadioButton, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
     connect(screenComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(screenChanged(int)));
+    connect(framerateLimitCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotFramerateLimitToggled(bool)));
+    connect(shadowDistanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotShadowDistLimitToggled(bool)));
 
 }
 
-bool Launcher::GraphicsPage::connectToSdl() {
-    SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
-    SDL_SetMainReady();
-    // Required for determining screen resolution and such on the Graphics tab
-    if (SDL_Init(SDL_INIT_VIDEO) != 0)
-    {
-        return false;
-    }
-    signal(SIGINT, SIG_DFL); // We don't want to use the SDL event loop in the launcher,
-    // so reset SIGINT which SDL wants to redirect to an SDL_Quit event.
-
-    return true;
-}
-
 bool Launcher::GraphicsPage::setupSDL()
 {
-    bool sdlConnectSuccessful = connectToSdl();
+    bool sdlConnectSuccessful = initSDL();
     if (!sdlConnectSuccessful)
     {
         return false;
@@ -78,19 +67,22 @@ bool Launcher::GraphicsPage::setupSDL()
         msgBox.setWindowTitle(tr("Error receiving number of screens"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
-        msgBox.setText(tr("<br><b>SDL_GetNumDisplayModes failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
+        msgBox.setText(tr("<br><b>SDL_GetNumVideoDisplays failed:</b><br><br>") + QString::fromUtf8(SDL_GetError()) + "<br>");
         msgBox.exec();
         return false;
     }
 
     screenComboBox->clear();
+    mResolutionsPerScreen.clear();
     for (int i = 0; i < displays; i++)
     {
+        mResolutionsPerScreen.append(getAvailableResolutions(i));
         screenComboBox->addItem(QString(tr("Screen ")) + QString::number(i + 1));
     }
+    screenChanged(0);
 
     // Disconnect from SDL processes
-    SDL_Quit();
+    quitSDL();
 
     return true;
 }
@@ -100,26 +92,27 @@ bool Launcher::GraphicsPage::loadSettings()
     if (!setupSDL())
         return false;
 
-    if (mEngineSettings.getBool("vsync", "Video"))
+    // Visuals
+    if (Settings::Manager::getBool("vsync", "Video"))
         vSyncCheckBox->setCheckState(Qt::Checked);
 
-    if (mEngineSettings.getBool("fullscreen", "Video"))
+    if (Settings::Manager::getBool("fullscreen", "Video"))
         fullScreenCheckBox->setCheckState(Qt::Checked);
 
-    if (mEngineSettings.getBool("window border", "Video"))
+    if (Settings::Manager::getBool("window border", "Video"))
         windowBorderCheckBox->setCheckState(Qt::Checked);
 
     // aaValue is the actual value (0, 1, 2, 4, 8, 16)
-    int aaValue = mEngineSettings.getInt("antialiasing", "Video");
+    int aaValue = Settings::Manager::getInt("antialiasing", "Video");
     // aaIndex is the index into the allowed values in the pull down.
     int aaIndex = antiAliasingComboBox->findText(QString::number(aaValue));
     if (aaIndex != -1)
         antiAliasingComboBox->setCurrentIndex(aaIndex);
 
-    int width = mEngineSettings.getInt("resolution x", "Video");
-    int height = mEngineSettings.getInt("resolution y", "Video");
+    int width = Settings::Manager::getInt("resolution x", "Video");
+    int height = Settings::Manager::getInt("resolution y", "Video");
     QString resolution = QString::number(width) + QString(" x ") + QString::number(height);
-    screenComboBox->setCurrentIndex(mEngineSettings.getInt("screen", "Video"));
+    screenComboBox->setCurrentIndex(Settings::Manager::getInt("screen", "Video"));
 
     int resIndex = resolutionComboBox->findText(resolution, Qt::MatchStartsWith);
 
@@ -132,28 +125,77 @@ bool Launcher::GraphicsPage::loadSettings()
         customHeightSpinBox->setValue(height);
     }
 
+    float fpsLimit = Settings::Manager::getFloat("framerate limit", "Video");
+    if (fpsLimit != 0)
+    {
+        framerateLimitCheckBox->setCheckState(Qt::Checked);
+        framerateLimitSpinBox->setValue(fpsLimit);
+    }
+
+    // Lighting
+    int lightingMethod = 1;
+    if (Settings::Manager::getString("lighting method", "Shaders") == "legacy")
+        lightingMethod = 0;
+    else if (Settings::Manager::getString("lighting method", "Shaders") == "shaders")
+        lightingMethod = 2;
+    lightingMethodComboBox->setCurrentIndex(lightingMethod);
+
+    // Shadows
+    if (Settings::Manager::getBool("actor shadows", "Shadows"))
+        actorShadowsCheckBox->setCheckState(Qt::Checked);
+    if (Settings::Manager::getBool("player shadows", "Shadows"))
+        playerShadowsCheckBox->setCheckState(Qt::Checked);
+    if (Settings::Manager::getBool("terrain shadows", "Shadows"))
+        terrainShadowsCheckBox->setCheckState(Qt::Checked);
+    if (Settings::Manager::getBool("object shadows", "Shadows"))
+        objectShadowsCheckBox->setCheckState(Qt::Checked);
+    if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
+        indoorShadowsCheckBox->setCheckState(Qt::Checked);
+
+    shadowComputeSceneBoundsComboBox->setCurrentIndex(
+        shadowComputeSceneBoundsComboBox->findText(
+            QString(tr(Settings::Manager::getString("compute scene bounds", "Shadows").c_str()))));
+
+    int shadowDistLimit = Settings::Manager::getInt("maximum shadow map distance", "Shadows");
+    if (shadowDistLimit > 0)
+    {
+        shadowDistanceCheckBox->setCheckState(Qt::Checked);
+        shadowDistanceSpinBox->setValue(shadowDistLimit);
+    }
+
+    float shadowFadeStart = Settings::Manager::getFloat("shadow fade start", "Shadows");
+    if (shadowFadeStart != 0)
+        fadeStartSpinBox->setValue(shadowFadeStart);
+
+    int shadowRes = Settings::Manager::getInt("shadow map resolution", "Shadows");
+    int shadowResIndex = shadowResolutionComboBox->findText(QString::number(shadowRes));
+    if (shadowResIndex != -1)
+        shadowResolutionComboBox->setCurrentIndex(shadowResIndex);
+
     return true;
 }
 
 void Launcher::GraphicsPage::saveSettings()
 {
+    // Visuals
+
     // Ensure we only set the new settings if they changed. This is to avoid cluttering the
     // user settings file (which by definition should only contain settings the user has touched)
     bool cVSync = vSyncCheckBox->checkState();
-    if (cVSync != mEngineSettings.getBool("vsync", "Video"))
-        mEngineSettings.setBool("vsync", "Video", cVSync);
+    if (cVSync != Settings::Manager::getBool("vsync", "Video"))
+        Settings::Manager::setBool("vsync", "Video", cVSync);
 
     bool cFullScreen = fullScreenCheckBox->checkState();
-    if (cFullScreen != mEngineSettings.getBool("fullscreen", "Video"))
-        mEngineSettings.setBool("fullscreen", "Video", cFullScreen);
+    if (cFullScreen != Settings::Manager::getBool("fullscreen", "Video"))
+        Settings::Manager::setBool("fullscreen", "Video", cFullScreen);
 
     bool cWindowBorder = windowBorderCheckBox->checkState();
-    if (cWindowBorder != mEngineSettings.getBool("window border", "Video"))
-        mEngineSettings.setBool("window border", "Video", cWindowBorder);
+    if (cWindowBorder != Settings::Manager::getBool("window border", "Video"))
+        Settings::Manager::setBool("window border", "Video", cWindowBorder);
 
     int cAAValue = antiAliasingComboBox->currentText().toInt();
-    if (cAAValue != mEngineSettings.getInt("antialiasing", "Video"))
-        mEngineSettings.setInt("antialiasing", "Video", cAAValue);
+    if (cAAValue != Settings::Manager::getInt("antialiasing", "Video"))
+        Settings::Manager::setInt("antialiasing", "Video", cAAValue);
 
     int cWidth = 0;
     int cHeight = 0;
@@ -168,15 +210,81 @@ void Launcher::GraphicsPage::saveSettings()
         cHeight = customHeightSpinBox->value();
     }
 
-    if (cWidth != mEngineSettings.getInt("resolution x", "Video"))
-        mEngineSettings.setInt("resolution x", "Video", cWidth);
+    if (cWidth != Settings::Manager::getInt("resolution x", "Video"))
+        Settings::Manager::setInt("resolution x", "Video", cWidth);
 
-    if (cHeight != mEngineSettings.getInt("resolution y", "Video"))
-        mEngineSettings.setInt("resolution y", "Video", cHeight);
+    if (cHeight != Settings::Manager::getInt("resolution y", "Video"))
+        Settings::Manager::setInt("resolution y", "Video", cHeight);
 
     int cScreen = screenComboBox->currentIndex();
-    if (cScreen != mEngineSettings.getInt("screen", "Video"))
-        mEngineSettings.setInt("screen", "Video", cScreen);
+    if (cScreen != Settings::Manager::getInt("screen", "Video"))
+        Settings::Manager::setInt("screen", "Video", cScreen);
+
+    if (framerateLimitCheckBox->checkState() != Qt::Unchecked)
+    {
+        float cFpsLimit = framerateLimitSpinBox->value();
+        if (cFpsLimit != Settings::Manager::getFloat("framerate limit", "Video"))
+            Settings::Manager::setFloat("framerate limit", "Video", cFpsLimit);
+    }
+    else if (Settings::Manager::getFloat("framerate limit", "Video") != 0)
+    {
+        Settings::Manager::setFloat("framerate limit", "Video", 0);
+    }
+
+    // Lighting
+    static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
+    Settings::Manager::setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
+
+    // Shadows
+    int cShadowDist = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
+    if (Settings::Manager::getInt("maximum shadow map distance", "Shadows") != cShadowDist)
+        Settings::Manager::setInt("maximum shadow map distance", "Shadows", cShadowDist);
+    float cFadeStart = fadeStartSpinBox->value();
+    if (cShadowDist > 0 && Settings::Manager::getFloat("shadow fade start", "Shadows") != cFadeStart)
+        Settings::Manager::setFloat("shadow fade start", "Shadows", cFadeStart);
+
+    bool cActorShadows = actorShadowsCheckBox->checkState();
+    bool cObjectShadows = objectShadowsCheckBox->checkState();
+    bool cTerrainShadows = terrainShadowsCheckBox->checkState();
+    bool cPlayerShadows = playerShadowsCheckBox->checkState();
+    if (cActorShadows || cObjectShadows || cTerrainShadows || cPlayerShadows)
+    {
+        if (!Settings::Manager::getBool("enable shadows", "Shadows"))
+            Settings::Manager::setBool("enable shadows", "Shadows", true);
+        if (Settings::Manager::getBool("actor shadows", "Shadows") != cActorShadows)
+            Settings::Manager::setBool("actor shadows", "Shadows", cActorShadows);
+        if (Settings::Manager::getBool("player shadows", "Shadows") != cPlayerShadows)
+            Settings::Manager::setBool("player shadows", "Shadows", cPlayerShadows);
+        if (Settings::Manager::getBool("object shadows", "Shadows") != cObjectShadows)
+            Settings::Manager::setBool("object shadows", "Shadows", cObjectShadows);
+        if (Settings::Manager::getBool("terrain shadows", "Shadows") != cTerrainShadows)
+            Settings::Manager::setBool("terrain shadows", "Shadows", cTerrainShadows);
+    }
+    else
+    {
+        if (Settings::Manager::getBool("enable shadows", "Shadows"))
+            Settings::Manager::setBool("enable shadows", "Shadows", false);
+        if (Settings::Manager::getBool("actor shadows", "Shadows"))
+            Settings::Manager::setBool("actor shadows", "Shadows", false);
+        if (Settings::Manager::getBool("player shadows", "Shadows"))
+            Settings::Manager::setBool("player shadows", "Shadows", false);
+        if (Settings::Manager::getBool("object shadows", "Shadows"))
+            Settings::Manager::setBool("object shadows", "Shadows", false);
+        if (Settings::Manager::getBool("terrain shadows", "Shadows"))
+            Settings::Manager::setBool("terrain shadows", "Shadows", false);
+    }
+
+    bool cIndoorShadows = indoorShadowsCheckBox->checkState();
+    if (Settings::Manager::getBool("enable indoor shadows", "Shadows") != cIndoorShadows)
+        Settings::Manager::setBool("enable indoor shadows", "Shadows", cIndoorShadows);
+
+    int cShadowRes = shadowResolutionComboBox->currentText().toInt();
+    if (cShadowRes != Settings::Manager::getInt("shadow map resolution", "Shadows"))
+        Settings::Manager::setInt("shadow map resolution", "Shadows", cShadowRes);
+
+    auto cComputeSceneBounds = shadowComputeSceneBoundsComboBox->currentText().toStdString();
+    if (cComputeSceneBounds != Settings::Manager::getString("compute scene bounds", "Shadows"))
+        Settings::Manager::setString("compute scene bounds", "Shadows", cComputeSceneBounds);
 }
 
 QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
@@ -209,9 +317,9 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
             return result;
         }
 
-        QString aspect = getAspect(mode.w, mode.h);
         QString resolution = QString::number(mode.w) + QString(" x ") + QString::number(mode.h);
 
+        QString aspect = getAspect(mode.w, mode.h);
         if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10")) {
             resolution.append(tr("\t(Wide ") + aspect + ")");
 
@@ -229,10 +337,10 @@ QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
 QRect Launcher::GraphicsPage::getMaximumResolution()
 {
     QRect max;
-    int screens = QApplication::desktop()->screenCount();
-    for (int i = 0; i < screens; ++i)
+
+    for (QScreen* screen : QGuiApplication::screens())
     {
-        QRect res = QApplication::desktop()->screenGeometry(i);
+        QRect res = screen->geometry();
         if (res.width() > max.width())
             max.setWidth(res.width());
         if (res.height() > max.height())
@@ -245,7 +353,7 @@ void Launcher::GraphicsPage::screenChanged(int screen)
 {
     if (screen >= 0) {
         resolutionComboBox->clear();
-        resolutionComboBox->addItems(getAvailableResolutions(screen));
+        resolutionComboBox->addItems(mResolutionsPerScreen[screen]);
     }
 }
 
@@ -277,3 +385,14 @@ void Launcher::GraphicsPage::slotStandardToggled(bool checked)
         customHeightSpinBox->setEnabled(true);
     }
 }
+
+void Launcher::GraphicsPage::slotFramerateLimitToggled(bool checked)
+{
+    framerateLimitSpinBox->setEnabled(checked);
+}
+
+void Launcher::GraphicsPage::slotShadowDistLimitToggled(bool checked)
+{
+    shadowDistanceSpinBox->setEnabled(checked);
+    fadeStartSpinBox->setEnabled(checked);
+}

apps/launcher/graphicspage.hpp

@@ -1,12 +1,12 @@
 #ifndef GRAPHICSPAGE_H
 #define GRAPHICSPAGE_H
 
-#include <QWidget>
-
 #include "ui_graphicspage.h"
 
 #include <components/settings/settings.hpp>
 
+#include "sdlinit.hpp"
+
 namespace Files { struct ConfigurationManager; }
 
 namespace Launcher
@@ -18,7 +18,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = 0);
+        explicit GraphicsPage(QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
@@ -29,19 +29,15 @@ namespace Launcher
     private slots:
         void slotFullScreenChanged(int state);
         void slotStandardToggled(bool checked);
+        void slotFramerateLimitToggled(bool checked);
+        void slotShadowDistLimitToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
-        Settings::Manager &mEngineSettings;
+        QVector<QStringList> mResolutionsPerScreen;
 
-        QStringList getAvailableResolutions(int screen);
-        QRect getMaximumResolution();
+        static QStringList getAvailableResolutions(int screen);
+        static QRect getMaximumResolution();
 
-        /**
-         * Connect to the SDL so that we can use it to determine graphics
-         * @return whether or not connecting to SDL is successful
-         */
-        bool connectToSdl();
         bool setupSDL();
     };
 }

apps/launcher/main.cpp

@@ -1,9 +1,8 @@
 #include <iostream>
 
-#include <QApplication>
+#include <QTranslator>
 #include <QTextCodec>
 #include <QDir>
-#include <QDebug>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #undef MAC_OS_X_VERSION_MIN_REQUIRED
@@ -19,6 +18,13 @@ int main(int argc, char *argv[])
     {
         QApplication app(argc, argv);
 
+        // Internationalization 
+        QString locale = QLocale::system().name().section('_', 0, 0);
+
+        QTranslator appTranslator;
+        appTranslator.load(":/translations/" + locale + ".qm");
+        app.installTranslator(&appTranslator);
+
         // Now we make sure the current dir is set to application path
         QDir dir(QCoreApplication::applicationDirPath());
 
@@ -33,11 +39,13 @@ int main(int argc, char *argv[])
         if (result == Launcher::FirstRunDialogResultContinue)
             mainWin.show();
 
-        return app.exec();
+        int exitCode = app.exec();
+
+        return exitCode;
     }
     catch (std::exception& e)
     {
         std::cerr << "ERROR: " << e.what() << std::endl;
         return 0;
     }
-}
+}

apps/launcher/maindialog.cpp

@@ -1,18 +1,16 @@
 #include "maindialog.hpp"
 
 #include <components/version/version.hpp>
+#include <components/misc/helpviewer.hpp>
 
 #include <QDate>
 #include <QMessageBox>
-#include <QPushButton>
 #include <QFontDatabase>
 #include <QInputDialog>
 #include <QFileDialog>
 #include <QCloseEvent>
 #include <QTextCodec>
 
-#include <QDebug>
-
 #include "playpage.hpp"
 #include "graphicspage.hpp"
 #include "datafilespage.hpp"
@@ -54,11 +52,15 @@ Launcher::MainDialog::MainDialog(QWidget *parent)
     iconWidget->setCurrentRow(0);
     iconWidget->setFlow(QListView::LeftToRight);
 
+    QPushButton *helpButton = new QPushButton(tr("Help"));
     QPushButton *playButton = new QPushButton(tr("Play"));
+    buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
+    buttonBox->addButton(helpButton, QDialogButtonBox::HelpRole);
     buttonBox->addButton(playButton, QDialogButtonBox::AcceptRole);
 
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(play()));
+    connect(buttonBox, SIGNAL(helpRequested()), this, SLOT(help()));
 
     // Remove what's this? button
     setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -115,11 +117,15 @@ void Launcher::MainDialog::createIcons()
 
 void Launcher::MainDialog::createPages()
 {
+    // Avoid creating the widgets twice
+    if (pagesWidget->count() != 0)
+        return;
+
     mPlayPage = new PlayPage(this);
     mDataFilesPage = new DataFilesPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mGraphicsPage = new GraphicsPage(mCfgMgr, mEngineSettings, this);
+    mGraphicsPage = new GraphicsPage(this);
     mSettingsPage = new SettingsPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mAdvancedPage = new AdvancedPage(mCfgMgr, mGameSettings, mEngineSettings, this);
+    mAdvancedPage = new AdvancedPage(mGameSettings, this);
 
     // Set the combobox of the play page to imitate the combobox on the datafilespage
     mPlayPage->setProfilesModel(mDataFilesPage->profilesModel());
@@ -165,18 +171,20 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
         QAbstractButton *skipButton =
                 msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
 
-        Q_UNUSED(skipButton); // Surpress compiler unused warning
-
         msgBox.exec();
 
         if (msgBox.clickedButton() == wizardButton)
         {
-            if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) {
-                return FirstRunDialogResultFailure;
-            } else {
+            if (mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false))
                 return FirstRunDialogResultWizard;
-            }
         }
+        else if (msgBox.clickedButton() == skipButton)
+        {
+            // Don't bother setting up absent game data.
+            if (setup())
+                return FirstRunDialogResultContinue;
+        }
+        return FirstRunDialogResultFailure;
     }
 
     if (!setup() || !setupGameData()) {
@@ -200,10 +208,10 @@ void Launcher::MainDialog::setVersionLabel()
         versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10)));
 
     // Add the compile date and time
-    versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale(QLocale::C).toDate(QString(__DATE__).simplified(),
-                                                                                    QLatin1String("MMM d yyyy")).toString(Qt::SystemLocaleLongDate),
-                                                         QLocale(QLocale::C).toTime(QString(__TIME__).simplified(),
-                                                                                    QLatin1String("hh:mm:ss")).toString(Qt::SystemLocaleShortDate)));
+    auto compileDate = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy"));
+    auto compileTime = QLocale(QLocale::C).toTime(QString(__TIME__).simplified(), QLatin1String("hh:mm:ss"));
+    versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale::system().toString(compileDate, QLocale::LongFormat),
+                                                         QLocale::system().toString(compileTime, QLocale::ShortFormat)));
 }
 
 bool Launcher::MainDialog::setup()
@@ -280,7 +288,8 @@ bool Launcher::MainDialog::setupLauncherSettings()
     paths.append(QString(Config::LauncherSettings::sLauncherConfigFileName));
     paths.append(userPath + QString(Config::LauncherSettings::sLauncherConfigFileName));
 
-    foreach (const QString &path, paths) {
+    for (const QString &path : paths)
+    {
         qDebug() << "Loading config file:" << path.toUtf8().constData();
         QFile file(path);
         if (file.exists()) {
@@ -329,6 +338,7 @@ bool Launcher::MainDialog::setupGameSettings()
         stream.setCodec(QTextCodec::codecForName("UTF-8"));
 
         mGameSettings.readUserFile(stream);
+        file.close();
     }
 
     // Now the rest - priority: user > local > global
@@ -337,7 +347,8 @@ bool Launcher::MainDialog::setupGameSettings()
     paths.append(localPath + QString("openmw.cfg"));
     paths.append(userPath + QString("openmw.cfg"));
 
-    foreach (const QString &path2, paths) {
+    for (const QString &path2 : paths)
+    {
         qDebug() << "Loading config file:" << path2.toUtf8().constData();
 
         file.setFileName(path2);
@@ -353,8 +364,8 @@ bool Launcher::MainDialog::setupGameSettings()
             stream.setCodec(QTextCodec::codecForName("UTF-8"));
 
             mGameSettings.readFile(stream);
+            file.close();
         }
-        file.close();
     }
 
     return true;
@@ -365,7 +376,8 @@ bool Launcher::MainDialog::setupGameData()
     QStringList dataDirs;
 
     // Check if the paths actually contain data files
-    foreach (const QString path3, mGameSettings.getDataDirs()) {
+    for (const QString& path3 : mGameSettings.getDataDirs())
+    {
         QDir dir(path3);
         QStringList filters;
         filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
@@ -379,22 +391,23 @@ bool Launcher::MainDialog::setupGameData()
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error detecting Morrowind installation"));
         msgBox.setIcon(QMessageBox::Warning);
-        msgBox.setStandardButtons(QMessageBox::Cancel);
+        msgBox.setStandardButtons(QMessageBox::NoButton);
         msgBox.setText(tr("<br><b>Could not find the Data Files location</b><br><br> \
                                    The directory containing the data files was not found."));
 
         QAbstractButton *wizardButton =
                 msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
+        QAbstractButton *skipButton =
+                msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
+
+        Q_UNUSED(skipButton); // Suppress compiler unused warning
 
         msgBox.exec();
 
         if (msgBox.clickedButton() == wizardButton)
         {
-            if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) {
+            if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false))
                 return false;
-            } else {
-                return true;
-            }
         }
     }
 
@@ -411,11 +424,11 @@ bool Launcher::MainDialog::setupGraphicsSettings()
     mEngineSettings.clear();
 
     // Create the settings manager and load default settings file
-    const std::string localDefault = (mCfgMgr.getLocalPath() / "settings-default.cfg").string();
-    const std::string globalDefault = (mCfgMgr.getGlobalPath() / "settings-default.cfg").string();
+    const std::string localDefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
+    const std::string globalDefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
     std::string defaultPath;
 
-    // Prefer the settings-default.cfg in the current directory.
+    // Prefer the defaults.bin in the current directory.
     if (boost::filesystem::exists(localDefault))
         defaultPath = localDefault;
     else if (boost::filesystem::exists(globalDefault))
@@ -423,7 +436,7 @@ bool Launcher::MainDialog::setupGraphicsSettings()
     // Something's very wrong if we can't find the file at all.
     else {
         cfgError(tr("Error reading OpenMW configuration file"),
-                 tr("<br><b>Could not find settings-default.cfg</b><br><br> \
+                 tr("<br><b>Could not find defaults.bin</b><br><br> \
                      The problem may be due to an incomplete installation of OpenMW.<br> \
                      Reinstalling OpenMW may resolve the problem."));
         return false;
@@ -434,7 +447,7 @@ bool Launcher::MainDialog::setupGraphicsSettings()
         mEngineSettings.loadDefault(defaultPath);
     }
     catch (std::exception& e) {
-        std::string msg = std::string("<br><b>Error reading settings-default.cfg</b><br><br>") + e.what();
+        std::string msg = std::string("<br><b>Error reading defaults.bin</b><br><br>") + e.what();
         cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str()));
         return false;
     }
@@ -577,7 +590,7 @@ void Launcher::MainDialog::wizardFinished(int exitCode, QProcess::ExitStatus exi
     // HACK: Ensure the pages are created, else segfault
     setup();
 
-    if (reloadSettings())
+    if (setupGameData() && reloadSettings())
         show();
 }
 
@@ -602,3 +615,8 @@ void Launcher::MainDialog::play()
     if (mGameInvoker->startProcess(QLatin1String("tes3mp-browser"), true))
         return qApp->quit();
 }
+
+void Launcher::MainDialog::help()
+{
+    Misc::HelpViewer::openHelp("reference/index.html");
+}

apps/launcher/maindialog.hpp

@@ -1,12 +1,10 @@
 #ifndef MAINDIALOG_H
 #define MAINDIALOG_H
 
-#include <QMainWindow>
-#include <QProcess>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
-#endif
+
 
 #include <components/process/processinvoker.hpp>
 
@@ -14,7 +12,7 @@
 #include <components/config/launchersettings.hpp>
 
 #include <components/settings/settings.hpp>
-
+#endif
 #include "ui_mainwindow.h"
 
 class QListWidgetItem;
@@ -48,7 +46,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit MainDialog(QWidget *parent = 0);
+        explicit MainDialog(QWidget *parent = nullptr);
         ~MainDialog();
 
         FirstRunDialogResult showFirstRunDialog();
@@ -59,6 +57,7 @@ namespace Launcher
     public slots:
         void changePage(QListWidgetItem *current, QListWidgetItem *previous);
         void play();
+        void help();
 
     private slots:
         void wizardStarted();
@@ -83,7 +82,7 @@ namespace Launcher
         inline bool startProgram(const QString &name, bool detached = false) { return startProgram(name, QStringList(), detached); }
         bool startProgram(const QString &name, const QStringList &arguments, bool detached = false);
 
-        void closeEvent(QCloseEvent *event);
+        void closeEvent(QCloseEvent *event) override;
 
         PlayPage *mPlayPage;
         GraphicsPage *mGraphicsPage;

apps/launcher/playpage.hpp

@@ -1,8 +1,6 @@
 #ifndef PLAYPAGE_H
 #define PLAYPAGE_H
 
-#include <QWidget>
-
 #include "ui_playpage.h"
 
 class QComboBox;
@@ -16,7 +14,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        PlayPage(QWidget *parent = 0);
+        PlayPage(QWidget *parent = nullptr);
         void setProfilesModel(QAbstractItemModel *model);
 
     signals:

apps/launcher/sdlinit.cpp

@@ -0,0 +1,24 @@
+#include <signal.h>
+
+#include <SDL.h>
+
+bool initSDL()
+{
+    SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
+    SDL_SetMainReady();
+    // Required for determining screen resolution and such on the Graphics tab
+    if (SDL_Init(SDL_INIT_VIDEO) != 0)
+    {
+        return false;
+    }
+    signal(SIGINT, SIG_DFL); // We don't want to use the SDL event loop in the launcher,
+    // so reset SIGINT which SDL wants to redirect to an SDL_Quit event.
+
+    return true;
+}
+
+void quitSDL()
+{
+    // Disconnect from SDL processes
+    SDL_Quit();
+}

apps/launcher/sdlinit.hpp

@@ -0,0 +1,8 @@
+#ifndef SDLINIT_H
+#define SDLINIT_H
+
+bool initSDL();
+
+void quitSDL();
+
+#endif

apps/launcher/settingspage.cpp

@@ -2,7 +2,6 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDebug>
 #include <QDir>
 
 #include <components/files/configurationmanager.hpp>
@@ -27,13 +26,13 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
     setupUi(this);
 
     QStringList languages;
-    languages << QLatin1String("English")
-              << QLatin1String("French")
-              << QLatin1String("German")
-              << QLatin1String("Italian")
-              << QLatin1String("Polish")
-              << QLatin1String("Russian")
-              << QLatin1String("Spanish");
+    languages << tr("English")
+              << tr("French")
+              << tr("German")
+              << tr("Italian")
+              << tr("Polish")
+              << tr("Russian")
+              << tr("Spanish");
 
     languageComboBox->addItems(languages);
 
@@ -61,7 +60,8 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
     // Detect Morrowind configuration files
     QStringList iniPaths;
 
-    foreach (const QString &path, mGameSettings.getDataDirs()) {
+    for (const QString &path : mGameSettings.getDataDirs())
+    {
         QDir dir(path);
         dir.setPath(dir.canonicalPath()); // Resolve symlinks
 

apps/launcher/settingspage.hpp

@@ -1,9 +1,6 @@
 #ifndef SETTINGSPAGE_HPP
 #define SETTINGSPAGE_HPP
 
-#include <QWidget>
-#include <QProcess>
-
 #include <components/process/processinvoker.hpp>
 
 #include "ui_settingspage.h"
@@ -24,7 +21,7 @@ namespace Launcher
 
     public:
         SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                      Config::LauncherSettings &launcherSettings, MainDialog *parent = 0);
+                      Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
         ~SettingsPage();
 
         void saveSettings();

apps/launcher/utils/cellnameloader.cpp

@@ -45,4 +45,5 @@ QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
     cell.loadNameAndData(esmReader, isDeleted);
 
     return QString::fromStdString(cell.mName);
-}
+}
+

apps/launcher/utils/cellnameloader.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_CELLNAMELOADER_H
 #define OPENMW_CELLNAMELOADER_H
 
-#include <QComboBox>
 #include <QSet>
 #include <QString>
 

apps/launcher/utils/lineedit.hpp

@@ -11,7 +11,6 @@
 #define LINEEDIT_H
 
 #include <QLineEdit>
-#include <QStyle>
 #include <QStylePainter>
 #include <QToolButton>
 
@@ -24,10 +23,10 @@ class LineEdit : public QLineEdit
     QString mPlaceholderText;
 
 public:
-    LineEdit(QWidget *parent = 0);
+    LineEdit(QWidget *parent = nullptr);
 
 protected:
-    void resizeEvent(QResizeEvent *);
+    void resizeEvent(QResizeEvent *) override;
 
 private slots:
     void updateClearButton(const QString &text);

apps/launcher/utils/openalutil.cpp

@@ -0,0 +1,61 @@
+#include <cstring>
+#include <vector>
+#include <memory>
+
+#include <apps/openmw/mwsound/alext.h>
+
+#include "openalutil.hpp"
+
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+#define ALC_ALL_DEVICES_SPECIFIER 0x1013
+#endif
+
+std::vector<const char *> Launcher::enumerateOpenALDevices()
+{
+    std::vector<const char *> devlist;
+    const ALCchar *devnames;
+
+    if(alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
+    {
+        devnames = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
+    }
+    else
+    {
+        devnames = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
+    }
+    
+    while(devnames && *devnames)
+    {
+        devlist.emplace_back(devnames);
+        devnames += strlen(devnames)+1;
+    }
+    return devlist;
+}
+
+std::vector<const char *> Launcher::enumerateOpenALDevicesHrtf()
+{
+    std::vector<const char *> ret;
+
+    ALCdevice *device = alcOpenDevice(nullptr);
+    if(device)
+    {
+        if(alcIsExtensionPresent(device, "ALC_SOFT_HRTF"))
+        {
+            LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
+            void* funcPtr = alcGetProcAddress(device, "alcGetStringiSOFT");
+            memcpy(&alcGetStringiSOFT, &funcPtr, sizeof(funcPtr));
+            ALCint num_hrtf;
+            alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
+            ret.reserve(num_hrtf);
+            for(ALCint i = 0;i < num_hrtf;++i)
+            {
+                const ALCchar *entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
+                if(strcmp(entry, "") == 0)
+                    break;
+                ret.emplace_back(entry);
+            }
+        }
+        alcCloseDevice(device);
+    }
+    return ret;
+}

apps/launcher/utils/openalutil.hpp

@@ -0,0 +1,7 @@
+#include <vector>
+
+namespace Launcher
+{
+    std::vector<const char *> enumerateOpenALDevices();
+    std::vector<const char *> enumerateOpenALDevicesHrtf();
+}

apps/launcher/utils/profilescombobox.cpp

@@ -1,5 +1,4 @@
 #include <QRegExpValidator>
-#include <QLineEdit>
 #include <QString>
 #include <QApplication>
 #include <QKeyEvent>
@@ -33,7 +32,7 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     ComboBoxLineEdit *edit = new ComboBoxLineEdit(this);
 
     setLineEdit(edit);
-    setCompleter(0);
+    setCompleter(nullptr);
 
     connect(lineEdit(), SIGNAL(editingFinished()), this,
                 SLOT(slotEditingFinished()));

apps/launcher/utils/profilescombobox.hpp

@@ -16,12 +16,12 @@ public:
     class ComboBoxLineEdit : public LineEdit
     {
     public:
-        explicit ComboBoxLineEdit (QWidget *parent = 0);
+        explicit ComboBoxLineEdit (QWidget *parent = nullptr);
     };
 
 public:
 
-    explicit ProfilesComboBox(QWidget *parent = 0);
+    explicit ProfilesComboBox(QWidget *parent = nullptr);
     void setEditEnabled(bool editable);
     void setCurrentProfile(int index)
     {

apps/launcher/utils/textinputdialog.cpp

@@ -23,7 +23,7 @@ Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &
     QValidator *validator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
     mLineEdit = new LineEdit(this);
     mLineEdit->setValidator(validator);
-    mLineEdit->setCompleter(0);
+    mLineEdit->setCompleter(nullptr);
 
     QVBoxLayout *dialogLayout = new QVBoxLayout(this);
     dialogLayout->addWidget(label);

apps/launcher/utils/textinputdialog.hpp

@@ -15,13 +15,13 @@ namespace Launcher
 
     public:
 
-        explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = 0);
+        explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
         ~TextInputDialog ();
 
         inline LineEdit *lineEdit() { return mLineEdit; }
         void setOkButtonEnabled(bool enabled);
 
-        int exec();
+        int exec() override;
 
     private:
 

apps/master/MasterServer.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 21.04.17.
-//
-
 #include <RakPeerInterface.h>
 #include <RakSleep.h>
 #include <BitStream.h>

apps/master/MasterServer.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 21.04.17.
-//
-
 #ifndef NEWMASTERPROTO_MASTERSERVER_HPP
 #define NEWMASTERPROTO_MASTERSERVER_HPP
 

apps/master/RestServer.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 13.05.17.
-//
-
 #include "RestServer.hpp"
 
 #include <boost/property_tree/ptree.hpp>

apps/master/RestServer.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 13.05.17.
-//
-
 #ifndef NEWRESTAPI_RESTSERVER_HPP
 #define NEWRESTAPI_RESTSERVER_HPP
 

apps/master/ServerTest.cpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 21.04.17.
-//
-
 #include <RakPeerInterface.h>
 #include <RakSleep.h>
 #include <BitStream.h>

apps/mwiniimporter/importer.cpp

@@ -230,9 +230,19 @@ MwIniImporter::MwIniImporter()
         "Blood:Texture 0",
         "Blood:Texture 1",
         "Blood:Texture 2",
+        "Blood:Texture 3",
+        "Blood:Texture 4",
+        "Blood:Texture 5",
+        "Blood:Texture 6",
+        "Blood:Texture 7",
         "Blood:Texture Name 0",
         "Blood:Texture Name 1",
         "Blood:Texture Name 2",
+        "Blood:Texture Name 3",
+        "Blood:Texture Name 4",
+        "Blood:Texture Name 5",
+        "Blood:Texture Name 6",
+        "Blood:Texture Name 7",
 
         // movies
         "Movies:Company Logo",
@@ -624,17 +634,6 @@ MwIniImporter::MwIniImporter()
         "Moons:Masser Fade Out Finish",
         "Moons:Script Color",
 
-        // blood
-        "Blood:Model 0",
-        "Blood:Model 1",
-        "Blood:Model 2",
-        "Blood:Texture 0",
-        "Blood:Texture 1",
-        "Blood:Texture 2",
-        "Blood:Texture Name 0",
-        "Blood:Texture Name 1",
-        "Blood:Texture Name 2",
-
         // werewolf (Bloodmoon)
         "General:Werewolf FOV",
 
@@ -646,7 +645,7 @@ MwIniImporter::MwIniImporter()
     }
 
     for(int i=0; fallback[i]; i++) {
-        mMergeFallback.push_back(fallback[i]);
+        mMergeFallback.emplace_back(fallback[i]);
     }
 }
 
@@ -677,7 +676,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const boost::filesystem::p
         }
 
         if(line[0] == '[') {
-            int pos = line.find(']');
+            int pos = static_cast<int>(line.find(']'));
             if(pos < 2) {
                 std::cout << "Warning: ini file wrongly formatted (" << line << "). Line ignored." << std::endl;
                 continue;
@@ -687,12 +686,12 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const boost::filesystem::p
             continue;
         }
 
-        int comment_pos = line.find(";");
+        int comment_pos = static_cast<int>(line.find(';'));
         if(comment_pos > 0) {
             line = line.substr(0,comment_pos);
         }
 
-        int pos = line.find("=");
+        int pos = static_cast<int>(line.find('='));
         if(pos < 1) {
             continue;
         }
@@ -723,7 +722,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const boost::filesystem::p
     while (std::getline(file, line)) {
 
         // we cant say comment by only looking at first char anymore
-        int comment_pos = line.find("#");
+        int comment_pos = static_cast<int>(line.find('#'));
         if(comment_pos > 0) {
             line = line.substr(0,comment_pos);
         }
@@ -732,7 +731,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const boost::filesystem::p
             continue;
         }
 
-        int pos = line.find("=");
+        int pos = static_cast<int>(line.find('='));
         if(pos < 1) {
             continue;
         }
@@ -860,11 +859,12 @@ std::vector<std::string>::iterator MwIniImporter::findString(std::vector<std::st
 }
 
 void MwIniImporter::addPaths(std::vector<boost::filesystem::path>& output, std::vector<std::string> input) {
-    for (auto& path : input) {
+    for (auto& path : input)
+    {
         if (path.front() == '"')
         {
-            path.erase(path.begin());
-            path.erase(path.end() - 1);
+            // Drop first and last characters - quotation marks
+            path = path.substr(1, path.size() - 2);
         }
         output.emplace_back(path);
     }
@@ -910,7 +910,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
                     std::time_t time = lastWriteTime(path, defaultTime);
                     if (time != defaultTime)
                     {
-                        contentFiles.push_back({time, path});
+                        contentFiles.emplace_back(time, std::move(path));
                         found = true;
                         break;
                     }
@@ -985,14 +985,7 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
     std::time_t writeTime(defaultTime);
     if (boost::filesystem::exists(filename))
     {
-        // FixMe: remove #if when Boost dependency for Linux builds updated
-        // This allows Linux to build until then
-#if (BOOST_VERSION >= 104800)
-        // need to resolve any symlinks so that we get time of file, not symlink
         boost::filesystem::path resolved = boost::filesystem::canonical(filename);
-#else
-        boost::filesystem::path resolved = filename;
-#endif
         writeTime = boost::filesystem::last_write_time(resolved);
 
         // print timestamp

apps/niftest/niftest.cpp

@@ -20,7 +20,7 @@ namespace bfs = boost::filesystem;
 ///See if the file has the named extension
 bool hasExtension(std::string filename, std::string  extensionToFind)
 {
-    std::string extension = filename.substr(filename.find_last_of(".")+1);
+    std::string extension = filename.substr(filename.find_last_of('.')+1);
 
     //Convert strings to lower case for comparison
     std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
@@ -80,7 +80,7 @@ void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
     }
 }
 
-std::vector<std::string> parseOptions (int argc, char** argv)
+bool parseOptions (int argc, char** argv, std::vector<std::string>& files)
 {
     bpo::options_description desc("Ensure that OpenMW can use the provided NIF and BSA files\n\n"
         "Usages:\n"
@@ -102,40 +102,44 @@ std::vector<std::string> parseOptions (int argc, char** argv)
         bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).
             options(desc).positional(p).run();
         bpo::store(valid_opts, variables);
+        bpo::notify(variables);
+        if (variables.count ("help"))
+        {
+            std::cout << desc << std::endl;
+            return false;
+        }
+        if (variables.count("input-file"))
+        {
+            files = variables["input-file"].as< std::vector<std::string> >();
+            return true;
+        }
     }
     catch(std::exception &e)
     {
         std::cout << "ERROR parsing arguments: " << e.what() << "\n\n"
             << desc << std::endl;
-        exit(1);
-    }
-
-    bpo::notify(variables);
-    if (variables.count ("help"))
-    {
-        std::cout << desc << std::endl;
-        exit(1);
-    }
-    if (variables.count("input-file"))
-    {
-        return variables["input-file"].as< std::vector<std::string> >();
+        return false;
     }
 
     std::cout << "No input files or directories specified!" << std::endl;
     std::cout << desc << std::endl;
-    exit(1);
+    return false;
 }
 
 int main(int argc, char **argv)
 {
-    std::vector<std::string> files = parseOptions (argc, argv);
+    std::vector<std::string> files;
+    if(!parseOptions (argc, argv, files))
+        return 1;
 
+    Nif::NIFFile::setLoadUnsupportedFiles(true);
 //     std::cout << "Reading Files" << std::endl;
     for(std::vector<std::string>::const_iterator it=files.begin(); it!=files.end(); ++it)
     {
-         std::string name = *it;
+        std::string name = *it;
 
-        try{
+        try
+        {
             if(isNIF(name))
             {
                 //std::cout << "Decoding: " << name << std::endl;

apps/opencs/CMakeLists.txt

@@ -19,6 +19,7 @@ opencs_hdrs_noqt (model/doc
 
 opencs_units (model/world
     idtable idtableproxymodel regionmap data commanddispatcher idtablebase resourcetable nestedtableproxymodel idtree infotableproxymodel landtexturetableproxymodel
+    actoradapter
     )
 
 
@@ -42,7 +43,7 @@ opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages gmstcheck topicinfocheck journalcheck
+    mergestages gmstcheck topicinfocheck journalcheck enchantmentcheck
     )
 
 opencs_hdrs_noqt (model/tools
@@ -81,14 +82,14 @@ opencs_units_noqt (view/world
 
 opencs_units (view/widget
     scenetoolbar scenetool scenetoolmode pushbutton scenetooltoggle scenetoolrun modebutton
-    scenetooltoggle2 scenetooltexturebrush completerpopup coloreditor colorpickerpopup droplineedit
+    scenetooltoggle2 scenetooltexturebrush scenetoolshapebrush completerpopup coloreditor colorpickerpopup droplineedit
     )
 
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
     orbitcameramode pathgridmode selectionmode pathgridselectionmode cameracontroller
-    cellwater terraintexturemode
+    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands
     )
 
 opencs_units_noqt (view/render
@@ -115,7 +116,7 @@ opencs_units (view/prefs
 
 opencs_units (model/prefs
     state setting intsetting doublesetting boolsetting enumsetting coloursetting shortcut
-    shortcuteventhandler shortcutmanager shortcutsetting modifiersetting
+    shortcuteventhandler shortcutmanager shortcutsetting modifiersetting stringsetting
     )
 
 opencs_units_noqt (model/prefs
@@ -148,23 +149,16 @@ if(WIN32)
     set(QT_USE_QTMAIN TRUE)
 endif(WIN32)
 
-if (DESIRED_QT_VERSION MATCHES 4)
-    include(${QT_USE_FILE})
-    qt4_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
-    qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
-    qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
-else()
-    qt5_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
-    qt5_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
-    qt5_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
-endif()
+qt5_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
+qt5_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
+qt5_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
 
 # for compiled .ui files
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if(APPLE)
     set (OPENCS_MAC_ICON "${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns")
-    set (OPENCS_CFG "${OpenMW_BINARY_DIR}/openmw-cs.cfg")
+    set (OPENCS_CFG "${OpenMW_BINARY_DIR}/defaults-cs.bin")
     set (OPENCS_DEFAULT_FILTERS_FILE "${OpenMW_BINARY_DIR}/resources/defaultfilters")
     set (OPENCS_OPENMW_CFG "${OpenMW_BINARY_DIR}/openmw.cfg")
 else()
@@ -221,13 +215,16 @@ if(APPLE)
 endif(APPLE)
 
 target_link_libraries(openmw-cs
-    ${OSG_LIBRARIES}
-    ${OPENTHREADS_LIBRARIES}
-    ${OSGTEXT_LIBRARIES}
-    ${OSGUTIL_LIBRARIES}
+    # CMake's built-in OSG finder does not use pkgconfig, so we have to
+    # manually ensure the order is correct for inter-library dependencies.
+    # This only makes a difference with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`.
+    # https://gitlab.kitware.com/cmake/cmake/-/issues/21701
     ${OSGVIEWER_LIBRARIES}
-    ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
+    ${OSGGA_LIBRARIES}
+    ${OSGUTIL_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
+    ${OSG_LIBRARIES}
     ${EXTERN_OSGQT_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
@@ -235,25 +232,45 @@ target_link_libraries(openmw-cs
     components
 )
 
-if (DESIRED_QT_VERSION MATCHES 4)
-    target_link_libraries(openmw-cs
-    ${QT_QTGUI_LIBRARY}
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTNETWORK_LIBRARY}
-    ${QT_QTOPENGL_LIBRARY})
-
-    if (WIN32)
-        target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
+if(OSG_STATIC)
+    unset(_osg_plugins_static_files)
+    add_library(openmw_cs_osg_plugins INTERFACE)
+    foreach(_plugin ${USED_OSG_PLUGINS})
+        string(TOUPPER ${_plugin} _plugin_uc)
+        if(OPENMW_USE_SYSTEM_OSG)
+            list(APPEND _osg_plugins_static_files ${${_plugin_uc}_LIBRARY})
+        else()
+            list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+            target_link_libraries(openmw_cs_osg_plugins INTERFACE $<TARGET_PROPERTY:${${_plugin_uc}_LIBRARY},LINK_LIBRARIES>)
+            add_dependencies(openmw_cs_osg_plugins ${${_plugin_uc}_LIBRARY})
+        endif()
+    endforeach()
+    # We use --whole-archive because OSG plugins use registration.
+    get_whole_archive_options(_opts ${_osg_plugins_static_files})
+    target_link_options(openmw_cs_osg_plugins INTERFACE ${_opts})
+    target_link_libraries(openmw-cs openmw_cs_osg_plugins)
+
+    if(OPENMW_USE_SYSTEM_OSG)
+        # OSG plugin pkgconfig files are missing these dependencies.
+        # https://github.com/openscenegraph/OpenSceneGraph/issues/1052
+        target_link_libraries(openmw freetype jpeg png)
     endif()
-else()
-    target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
-endif()
+endif(OSG_STATIC)
+
+target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
 
 if (WIN32)
     target_link_libraries(openmw-cs ${Boost_LOCALE_LIBRARY})
     INSTALL(TARGETS openmw-cs RUNTIME DESTINATION ".")
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/Debug/openmw-cs.cfg" DESTINATION "." CONFIGURATIONS Debug)
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/Release/openmw-cs.cfg" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
+
+    get_generator_is_multi_config(multi_config)
+    if (multi_config)
+        SET(INSTALL_SOURCE "${OpenMW_BINARY_DIR}/$<CONFIG>")
+    else ()
+        SET(INSTALL_SOURCE "${OpenMW_BINARY_DIR}")
+    endif ()
+
+    INSTALL(FILES "${INSTALL_SOURCE}/defaults-cs.bin" DESTINATION ".")
 endif()
 
 if (MSVC)
@@ -265,5 +282,5 @@ endif (MSVC)
 
 
 if(APPLE)
-    INSTALL(TARGETS openmw-cs BUNDLE DESTINATION "." COMPONENT BUNDLE)
+    INSTALL(TARGETS openmw-cs BUNDLE DESTINATION "." COMPONENT Bundle)
 endif()